Repository: openmeetings Updated Branches: refs/heads/master 63b94ad59 -> f86904557
[OPENMEETINGS-1714] more issues are fixed Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/f8690455 Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/f8690455 Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/f8690455 Branch: refs/heads/master Commit: f86904557dd4a076672eaa5c7828edd36737e8d9 Parents: 63b94ad Author: Maxim Solodovnik <[email protected]> Authored: Fri Sep 29 15:03:57 2017 +0700 Committer: Maxim Solodovnik <[email protected]> Committed: Fri Sep 29 15:03:57 2017 +0700 ---------------------------------------------------------------------- .../screenshare/gui/ScreenSharerFrame.java | 2 +- .../openmeetings/screenshare/job/RemoteJob.java | 4 +-- .../apache/openmeetings/web/room/wb/player.js | 2 +- .../openmeetings/web/room/wb/tool-text.js | 6 ++-- .../apache/openmeetings/web/room/wb/wb-area.js | 6 ++-- .../apache/openmeetings/web/room/wb/wb-board.js | 37 ++++++++++---------- 6 files changed, 28 insertions(+), 29 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/openmeetings/blob/f8690455/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/gui/ScreenSharerFrame.java ---------------------------------------------------------------------- diff --git a/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/gui/ScreenSharerFrame.java b/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/gui/ScreenSharerFrame.java index c3d72ae..0f90825 100644 --- a/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/gui/ScreenSharerFrame.java +++ b/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/gui/ScreenSharerFrame.java @@ -112,7 +112,7 @@ public class ScreenSharerFrame extends JFrame { private String recordingTipLabel; private String publishingTipLabel; private JCheckBox audioNotify; - private final Core core; + private final transient Core core; private class PublishTextField extends JTextField { private static final long serialVersionUID = 1L; http://git-wip-us.apache.org/repos/asf/openmeetings/blob/f8690455/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/job/RemoteJob.java ---------------------------------------------------------------------- diff --git a/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/job/RemoteJob.java b/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/job/RemoteJob.java index 122fffd..f60c60b 100644 --- a/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/job/RemoteJob.java +++ b/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/job/RemoteJob.java @@ -188,8 +188,8 @@ public class RemoteJob implements Job { } private Point getCoordinates(Map<String, Object> obj) { - float scaleFactorX = dim.getSpinnerWidth() / dim.getResizeX(); - float scaleFactorY = dim.getSpinnerHeight() / dim.getResizeY(); + float scaleFactorX = ((float)dim.getSpinnerWidth()) / dim.getResizeX(); + float scaleFactorY = ((float)dim.getSpinnerHeight()) / dim.getResizeY(); int x = Math.round(scaleFactorX * getFloat(obj, "x") + dim.getSpinnerX()); int y = Math.round(scaleFactorY * getFloat(obj, "y") + dim.getSpinnerY()); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/f8690455/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/player.js ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/player.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/player.js index 9509ceb..81a20cf 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/player.js +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/player.js @@ -85,7 +85,7 @@ var Player = (function() { , ry: 5 }); let isDone = function() { - return video.getElement().currentTime == video.getElement().duration; + return video.getElement().currentTime === video.getElement().duration; }; let updateProgress = function() { progress.set('width', (video.getElement().currentTime * cProgress.width) / video.getElement().duration); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/f8690455/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/tool-text.js ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/tool-text.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/tool-text.js index 2656a0a..145aac0 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/tool-text.js +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/tool-text.js @@ -12,7 +12,7 @@ var Text = function(wb, s) { var canvas = this; var pointer = canvas.getPointer(o.e); var ao = canvas.getActiveObject(); - if (!!ao && ao.type == 'i-text') { + if (!!ao && ao.type === 'i-text') { text.obj = ao; } else { text.obj = new fabric.IText('', { @@ -39,7 +39,7 @@ var Text = function(wb, s) { canvas.on('mouse:down', text.mouseDown); canvas.selection = true; canvas.forEachObject(function(o) { - if (o.type == 'i-text') { + if (o.type === 'i-text') { o.selectable = true; } }); @@ -63,7 +63,7 @@ var Text = function(wb, s) { canvas.off('mouse:down', text.mouseDown); canvas.selection = false; canvas.forEachObject(function(o) { - if (o.type == 'i-text') { + if (o.type === 'i-text') { o.selectable = false; } }); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/f8690455/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/wb-area.js ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/wb-area.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/wb-area.js index c88e125..aa0858a 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/wb-area.js +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/wb-area.js @@ -54,7 +54,7 @@ var WbArea = (function() { } function _activateTab(wbId) { container.find('.wb-tabbar li').each(function(idx) { - if (wbId == 1 * $(this).data('wb-id')) { + if (wbId === 1 * $(this).data('wb-id')) { tabs.tabs("option", "active", idx); $(this)[0].scrollIntoView(); return false; @@ -73,7 +73,7 @@ var WbArea = (function() { wbTabs.find(".ui-tabs-panel .scroll-container").height(wbah); } function _addCloseBtn(li) { - if (role != PRESENTER) { + if (role !== PRESENTER) { return; } li.append($('#wb-tab-close').clone().attr('id', '')); @@ -117,7 +117,7 @@ var WbArea = (function() { tabsNav.sortable(role === PRESENTER ? "enable" : "disable"); var prev = tabs.find('.prev.om-icon'), next = tabs.find('.next.om-icon'); if (role === PRESENTER) { - if (prev.length == 0) { + if (prev.length === 0) { var cc = tabs.find('.wb-tabbar .scroll-container') , left = $('#wb-tabbar-ctrls-left').clone().attr('id', '') , right = $('#wb-tabbar-ctrls-right').clone().attr('id', ''); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/f8690455/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/wb-board.js ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/wb-board.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/wb-board.js index 79d0338..92baca0 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/wb-board.js +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/wb-board.js @@ -99,9 +99,9 @@ var Wb = function() { , scroll: false , stop: function(event, ui) { var pos = ui.helper.position(); - if (pos.left == 0 || pos.left + ui.helper.width() == ui.helper.parent().width()) { + if (pos.left === 0 || pos.left + ui.helper.width() === ui.helper.parent().width()) { ui.helper.removeClass('horisontal').addClass('vertical'); - } else if (pos.top == 0 || pos.top + ui.helper.height() == ui.helper.parent().height()) { + } else if (pos.top === 0 || pos.top + ui.helper.height() === ui.helper.parent().height()) { ui.helper.removeClass('vertical').addClass('horisontal'); } } @@ -170,17 +170,17 @@ var Wb = function() { var btn = getBtn(); var isColor = $(this).hasClass('wb-prop-lock-color'); var c = s.find(isColor ? '.wb-prop-color' : '.wb-prop-fill'); - var enabled = $(this).button('option', 'icon') == 'ui-icon-locked'; + var enabled = $(this).button('option', 'icon') === 'ui-icon-locked'; $(this).button('option', 'icon', enabled ? 'ui-icon-unlocked' : 'ui-icon-locked'); c.prop('disabled', !enabled); btn.data().obj[isColor ? 'stroke' : 'fill'].enabled = enabled; }); s.find('.wb-prop-color').change(function() { var btn = getBtn(); - if (btn.length == 1) { + if (btn.length === 1) { var v = $(this).val(); btn.data().obj.stroke.color = v; - if ('paint' == mode) { + if ('paint' === mode) { wb.eachCanvas(function(canvas) { canvas.freeDrawingBrush.color = v; }); @@ -189,10 +189,10 @@ var Wb = function() { }); s.find('.wb-prop-width').change(function() { var btn = getBtn(); - if (btn.length == 1) { + if (btn.length === 1) { var v = 1 * $(this).val(); btn.data().obj.stroke.width = v; - if ('paint' == mode) { + if ('paint' === mode) { wb.eachCanvas(function(canvas) { canvas.freeDrawingBrush.width = v; }); @@ -208,10 +208,10 @@ var Wb = function() { }); s.find('.wb-prop-opacity').change(function() { var btn = getBtn(); - if (btn.length == 1) { + if (btn.length === 1) { var v = (1 * $(this).val()) / 100; btn.data().obj.opacity = v; - if ('paint' == mode) { + if ('paint' === mode) { wb.eachCanvas(function(canvas) { canvas.freeDrawingBrush.opacity = v; }); @@ -332,7 +332,7 @@ var Wb = function() { canvas.setBackgroundImage(_o._src + "&slide=" + i, canvas.renderAll.bind(canvas), {}); } _updateZoomPanel(); - if (ccount != canvases.length) { + if (ccount !== canvases.length) { let b = getBtn(); if (b.length && b.hasClass(ACTIVE)) { b.data().deactivate(); @@ -382,9 +382,8 @@ var Wb = function() { } //events function wbObjCreatedHandler(o) { - if (role === NONE && o.type != 'pointer') return; + if (role === NONE && o.type !== 'pointer') return; - var json = {}; switch(o.type) { case 'pointer': json = o; @@ -415,7 +414,7 @@ var Wb = function() { }; function objModifiedHandler(e) { var o = e.target; - if (role === NONE && o.type != 'pointer') return; + if (role === NONE && o.type !== 'pointer') return; o.includeDefaultValues = false; var items = []; @@ -451,7 +450,7 @@ var Wb = function() { function scrollHandler(e) { $(this).find('.canvas-container').each(function(idx) { var h = $(this).height(), pos = $(this).position(); - if (slide != idx && pos.top > BUMPER - h && pos.top < BUMPER) { + if (slide !== idx && pos.top > BUMPER - h && pos.top < BUMPER) { //TODO FIXME might be done without iterating //console.log("Found:", idx); _setSlide(idx); @@ -465,7 +464,7 @@ var Wb = function() { $(this).show(); a.find('.scroll-container .canvas-container')[slide].scrollIntoView(); } else { - if (idx == slide) { + if (idx === slide) { $(this).show(); } else { $(this).hide(); @@ -520,7 +519,7 @@ var Wb = function() { canvases.push(canvas); var cc = $('#' + cid).closest('.canvas-container'); if (role === NONE) { - if (sl == slide) { + if (sl === slide) { cc.show(); } else { cc.hide(); @@ -545,7 +544,7 @@ var Wb = function() { default: { var oo = z.find('.zoom').find('option[value="' + zoom.toFixed(2) + '"]'); - if (oo.length == 1) { + if (oo.length === 1) { oo.prop('selected', true); } else { z.find('.zoom').data('custom-val', zoom).find('option[value=custom]') @@ -566,9 +565,9 @@ var Wb = function() { } } wb.setRole = function(_role) { - if (role != _role) { + if (role !== _role) { var btn = getBtn(); - if (!!btn && btn.length == 1) { + if (!!btn && btn.length === 1) { btn.data().deactivate(); } a.find('.tools').remove();
