Repository: openmeetings Updated Branches: refs/heads/master 32fde7a85 -> 1da939edb
[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/1da939ed Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/1da939ed Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/1da939ed Branch: refs/heads/master Commit: 1da939edb067572c87a68587ee5186f1736946d5 Parents: 32fde7a Author: Maxim Solodovnik <[email protected]> Authored: Mon Oct 2 16:33:04 2017 +0700 Committer: Maxim Solodovnik <[email protected]> Committed: Mon Oct 2 16:33:04 2017 +0700 ---------------------------------------------------------------------- .../main/java/org/apache/openmeetings/web/common/tree/filetree.js | 2 +- .../org/apache/openmeetings/web/room/activities/activities.js | 2 +- .../src/main/java/org/apache/openmeetings/web/room/room.js | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1da939ed/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/filetree.js ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/filetree.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/filetree.js index 57f794c..3a0ea76 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/filetree.js +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/filetree.js @@ -1,6 +1,6 @@ /* Licensed under the Apache License, Version 2.0 (the "License") http://www.apache.org/licenses/LICENSE-2.0 */ function dragHelper() { - const s = $(this); + let s = $(this); if (s.parents('a').hasClass('ui-state-active')) { s = $('.ui-state-active .ui-draggable.ui-draggable-handle'); } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1da939ed/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/activities.js ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/activities.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/activities.js index e8ed19a..1addb0a 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/activities.js +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/activities.js @@ -19,7 +19,7 @@ var Activities = function() { if (!isInited()) { activities.resizable({ handles: "n, e" - , disabled: isClosed(activities) + , disabled: isClosed() , alsoResize: "#activities .area" , minHeight: 195 , minWidth: 260 http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1da939ed/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room.js ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room.js index 4e452b9..9a3aec3 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room.js +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room.js @@ -64,8 +64,9 @@ var VideoUtil = (function() { } }; //console.log("Area " + JSON.stringify(area)); + let minY = area.bottom, posFound; do { - let minY = area.bottom, posFound = true; + posFound = true //console.log("Checking RECT " + JSON.stringify(rectNew)); for (let i = 0; i < list.length; ++i) { const rect = list[i];
