Repository: openmeetings Updated Branches: refs/heads/master 38d9999a2 -> c1122318d
[OPENMEETINGS-1646] code clean-up Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/c1122318 Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/c1122318 Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/c1122318 Branch: refs/heads/master Commit: c1122318dd57e5e1dda6269f112cec5199134427 Parents: 38d9999 Author: Maxim Solodovnik <[email protected]> Authored: Thu Jun 22 23:54:13 2017 +0700 Committer: Maxim Solodovnik <[email protected]> Committed: Thu Jun 22 23:54:13 2017 +0700 ---------------------------------------------------------------------- .../main/java/org/apache/openmeetings/web/room/room.js | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/openmeetings/blob/c1122318/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 866d033..9ad8a82 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 @@ -144,9 +144,15 @@ var VideoManager = (function() { } else if (av && v.length == 1) { v.data().update(c); } else if (!av && v.length == 1) { - v.remove(); + _closeV(v); } } + function _closeV(v) { + if (v.dialog('instance') !== undefined) { + v.dialog('destroy'); + } + v.remove(); + } function _play(c) { if (!!c.screenShare) { _highlight(share.attr('title', share.data('user') + ' ' + c.user.firstName + ' ' + c.user.lastName + ' ' + share.data('text')).show(), 10); @@ -168,7 +174,7 @@ var VideoManager = (function() { if (v.data().client().screenShare) { share.off('click').hide(); } - v.remove(); + _closeV(v); } } function _highlight(el, count) {
