This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to refs/heads/master by this push:
new 939a38b [OPENMEETINGS-2000] error with video in FF should be fixed
939a38b is described below
commit 939a38be52c695651ca90404c4bda4d02fb94f91
Author: Maxim Solodovnik <[email protected]>
AuthorDate: Tue Dec 29 18:06:15 2020 +0700
[OPENMEETINGS-2000] error with video in FF should be fixed
---
openmeetings-web/src/main/front/room/src/video.js | 98 ++++++++++++-----------
1 file changed, 50 insertions(+), 48 deletions(-)
diff --git a/openmeetings-web/src/main/front/room/src/video.js
b/openmeetings-web/src/main/front/room/src/video.js
index 3411cca..e4fa218 100644
--- a/openmeetings-web/src/main/front/room/src/video.js
+++ b/openmeetings-web/src/main/front/room/src/video.js
@@ -578,6 +578,55 @@ module.exports = class Video {
}
});
}
+ function _init(_msg) {
+ sd = _msg.stream;
+ _msg.instanceUid = uuidv4();
+ if (!vol) {
+ vol = new Volume();
+ }
+ iceServers = _msg.iceServers;
+ sd.activities = sd.activities.sort();
+ isSharing = VideoUtil.isSharing(sd);
+ isRecording = VideoUtil.isRecording(sd);
+ const _id = VideoUtil.getVid(sd.uid)
+ , name = sd.user.displayName
+ , _w = sd.width
+ , _h = sd.height
+ , opts = Room.getOptions();
+ sd.self = sd.cuid === opts.uid;
+ const contSel = _initContainer(_id, name, opts,
_msg.instanceUid);
+ footer = v.find('.footer');
+ if (!opts.showMicStatus) {
+ footer.hide();
+ }
+ if (!sd.self && isSharing) {
+ Sharer.close();
+ }
+ if (sd.self && (isSharing || isRecording)) {
+ v.hide();
+ } else if (hasVideo) {
+ v.dialog({
+ classes: {
+ 'ui-dialog': 'video user-video'
+ (opts.showMicStatus ? ' mic-status' : '')
+ , 'ui-dialog-titlebar': '' +
(opts.showMicStatus ? ' ui-state-highlight' : '')
+ }
+ , width: _w
+ , minWidth: 40
+ , minHeight: 50
+ , autoOpen: true
+ , modal: false
+ , appendTo: contSel
+ });
+ _initDialog(v, opts);
+ }
+ t =
v.parent().find('.ui-dialog-titlebar').attr('title', name);
+ v.on('remove', _cleanup);
+ if (hasVideo) {
+ vc.width(_w).height(_h);
+ }
+
+ _refresh(_msg);
+ }
this.update = _update;
this.refresh = _refresh;
@@ -611,53 +660,6 @@ module.exports = class Video {
};
this.handleMicStatus = _handleMicStatus;
- // init
- sd = msg.stream;
- msg.instanceUid = uuidv4();
- if (!vol) {
- vol = new Volume();
- }
- iceServers = msg.iceServers;
- sd.activities = sd.activities.sort();
- isSharing = VideoUtil.isSharing(sd);
- isRecording = VideoUtil.isRecording(sd);
- const _id = VideoUtil.getVid(sd.uid)
- , name = sd.user.displayName
- , _w = sd.width
- , _h = sd.height
- , opts = Room.getOptions();
- sd.self = sd.cuid === opts.uid;
- const contSel = _initContainer(_id, name, opts,
msg.instanceUid);
- footer = v.find('.footer');
- if (!opts.showMicStatus) {
- footer.hide();
- }
- if (!sd.self && isSharing) {
- Sharer.close();
- }
- if (sd.self && (isSharing || isRecording)) {
- v.hide();
- } else if (hasVideo) {
- v.dialog({
- classes: {
- 'ui-dialog': 'video user-video' +
(opts.showMicStatus ? ' mic-status' : '')
- , 'ui-dialog-titlebar': '' +
(opts.showMicStatus ? ' ui-state-highlight' : '')
- }
- , width: _w
- , minWidth: 40
- , minHeight: 50
- , autoOpen: true
- , modal: false
- , appendTo: contSel
- });
- _initDialog(v, opts);
- }
- t = v.parent().find('.ui-dialog-titlebar').attr('title', name);
- v.on('remove', _cleanup);
- if (hasVideo) {
- vc.width(_w).height(_h);
- }
-
- _refresh(msg);
+ _init(msg);
}
};
