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/09/19 16:39:37 UTC
openmeetings git commit: [OPENMEETINGS-1706] open/close AV dialog is
fixed
Repository: openmeetings
Updated Branches:
refs/heads/master 5ef585959 -> b630c8253
[OPENMEETINGS-1706] open/close AV dialog is fixed
Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/b630c825
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/b630c825
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/b630c825
Branch: refs/heads/master
Commit: b630c8253d3fddc0e628b73358f0ee8bd542f63b
Parents: 5ef5859
Author: Maxim Solodovnik <so...@gmail.com>
Authored: Tue Sep 19 23:39:27 2017 +0700
Committer: Maxim Solodovnik <so...@gmail.com>
Committed: Tue Sep 19 23:39:27 2017 +0700
----------------------------------------------------------------------
.../main/java/org/apache/openmeetings/web/room/room.js | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/b630c825/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 e07056d..d70ba7f 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
@@ -130,9 +130,7 @@ var Video = (function() {
function _securityMode(on) {
if (on) {
//TODO buttons
- v.dialog({
- position: {my: "center", at: "center", of: WBA_SEL}
- });
+ v.dialog("option", "position", {my: "center", at: "center", of: WBA_SEL});
} else {
let h = _resizeDlg(size.width, size.height);
v.dialog("widget").css(VideoUtil.getPos(VideoUtil.getRects(VID_SEL, VideoUtil.getVid(c.uid)), c.width, h));
@@ -218,6 +216,9 @@ var Video = (function() {
_resize(w, h);
swf[0].vidResize(w, h);
}
+ , close: function(event, ui) {
+ VideoManager.close(c.uid, true);
+ }
}).dialogExtend({
icons: {
'collapse': 'ui-icon-minus'
@@ -369,7 +370,7 @@ var VideoManager = (function() {
let cl = JSON.parse(JSON.stringify(c)), s = c.streams[i];
delete cl.streams;
$.extend(cl, s);
- if (VideoUtil.isRecording(cl)) {
+ if (cl.self && VideoUtil.isSharing(cl) || VideoUtil.isRecording(cl)) {
continue;
}
let _id = VideoUtil.getVid(cl.uid)
@@ -427,12 +428,12 @@ var VideoManager = (function() {
Video().init(c, VideoUtil.getPos(VideoUtil.getRects(VID_SEL), c.width, c.height + 25));
}
}
- function _close(uid) {
+ function _close(uid, showShareBtn) {
var _id = VideoUtil.getVid(uid), v = $('#' + _id);
if (v.length == 1) {
_closeV(v);
}
- if (uid === share.data('uid')) {
+ if (!showShareBtn && uid === share.data('uid')) {
share.off('click').hide();
}
}