Repository: openmeetings Updated Branches: refs/heads/master 60a416be3 -> 469ba45d1
[OPENMEETINGS-1657] duplicated objects are fixed Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/469ba45d Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/469ba45d Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/469ba45d Branch: refs/heads/master Commit: 469ba45d13e2d65e2d2641e90e440dfa0c14e858 Parents: 60a416b Author: Maxim Solodovnik <[email protected]> Authored: Thu Jun 22 14:18:12 2017 +0700 Committer: Maxim Solodovnik <[email protected]> Committed: Thu Jun 22 14:18:12 2017 +0700 ---------------------------------------------------------------------- .../src/main/java/org/apache/openmeetings/web/room/wb/wb.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/openmeetings/blob/469ba45d/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 9ad58a3..bc29fcd 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 @@ -675,7 +675,7 @@ var Wb = function() { } } function _findObject(o) { - var _o = {}; + var _o = null; canvases[o.slide].forEachObject(function(__o) { if (!!__o && o.uid === __o.uid) { _o = __o; @@ -973,7 +973,10 @@ var Wb = function() { APointer().create(canvases[o.slide], o); break; default: - _createObject([o], _createHandler); + var __o = _findObject(o); + if (!__o) { + _createObject([o], _createHandler); + } /* * https://jsfiddle.net/l2aelba/kro7h6rv/2/ if ('Video' === o.fileType || 'Recording' === o.fileType) {
