[openmeetings] branch master updated: [OPENMEETINGS-2000] screen-sharing should be displayed with maximum size

[solomax]

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 7585954  [OPENMEETINGS-2000] screen-sharing should be displayed with 
maximum size
7585954 is described below

commit 7585954eec8946c37ea3e7028983dbb75871826e
Author: Maxim Solodovnik <solomax...@gmail.com>
AuthorDate: Sun Jan 24 19:38:40 2021 +0700

    [OPENMEETINGS-2000] screen-sharing should be displayed with maximum size
---
 openmeetings-web/src/main/front/room/src/video-manager.js | 6 +++---
 openmeetings-web/src/main/front/room/src/video.js         | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/openmeetings-web/src/main/front/room/src/video-manager.js 
b/openmeetings-web/src/main/front/room/src/video-manager.js
index 0195749..d8254fc 100644
--- a/openmeetings-web/src/main/front/room/src/video-manager.js
+++ b/openmeetings-web/src/main/front/room/src/video-manager.js
@@ -150,12 +150,12 @@ function _update(c) {
        });
 }
 function _playSharing(sd, iceServers) {
-       const m = {stream: sd, iceServers: iceServers};
-       let v = $('#' + VideoUtil.getVid(sd.uid))
+       const m = {stream: sd, iceServers: iceServers}
+               , v = $('#' + VideoUtil.getVid(sd.uid))
        if (v.length === 1) {
                v.remove();
        }
-       v = new Video(m);
+       new Video(m);
        VideoUtil.setPos(v, {left: 0, top: 35});
 }
 function _play(streams, iceServers) {
diff --git a/openmeetings-web/src/main/front/room/src/video.js 
b/openmeetings-web/src/main/front/room/src/video.js
index 5d74181..59cedd5 100644
--- a/openmeetings-web/src/main/front/room/src/video.js
+++ b/openmeetings-web/src/main/front/room/src/video.js
@@ -269,7 +269,7 @@ module.exports = class Video {
                        const _hasVideo = VideoUtil.hasVideo(sd)
                        if (_hasVideo) {
                                const s = VideoSettings.load();
-                               if (s.fixed.enabled) {
+                               if (s.fixed.enabled && !opts.interview && 
!isSharing) {
                                        size = {
                                                width: s.fixed.width
                                                , height: s.fixed.height