You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2017/08/30 04:20:21 UTC
openmeetings git commit: [OPENMEETINGS-1638] name conflict is resolved
Repository: openmeetings
Updated Branches:
refs/heads/master 6d4cfc758 -> 9e30dd6aa
[OPENMEETINGS-1638] name conflict is resolved
Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/9e30dd6a
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/9e30dd6a
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/9e30dd6a
Branch: refs/heads/master
Commit: 9e30dd6aaf585dba2f4aba755e32eeae9be026a0
Parents: 6d4cfc7
Author: Maxim Solodovnik <so...@gmail.com>
Authored: Wed Aug 30 11:20:13 2017 +0700
Committer: Maxim Solodovnik <so...@gmail.com>
Committed: Wed Aug 30 11:20:13 2017 +0700
----------------------------------------------------------------------
.../java/org/apache/openmeetings/web/room/wb/interviewwb.js | 2 +-
.../src/main/java/org/apache/openmeetings/web/room/wb/wb.js | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/9e30dd6a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/interviewwb.js
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/interviewwb.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/interviewwb.js
index 17e4123..2aa8426 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/interviewwb.js
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/interviewwb.js
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-const NONE = 'none';
+var NONE = 'none';
var WbArea = (function() {
var container, area, role = NONE, self = {}, choose, btns, _inited = false;
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/9e30dd6a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/wb.js
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/wb.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/wb.js
index bb95011..7deb579 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/wb.js
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/wb.js
@@ -22,9 +22,9 @@
* @license MIT license
* @link http://stackoverflow.com/questions/105034/how-to-create-a-guid-uuid-in-javascript/21963136#21963136
**/
-const PRESENTER = 'presenter';
-const WHITEBOARD = 'whiteBoard';
-const NONE = 'none';
+var PRESENTER = 'presenter';
+var WHITEBOARD = 'whiteBoard';
+var NONE = 'none';
var UUID = (function() {
var self = {};
var lut = [];