[openmeetings] branch master updated: [OPENMEETINGS-2380] audio-only pod is smaller

[so...@apache.org]

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 4e653c3  [OPENMEETINGS-2380] audio-only pod is smaller
4e653c3 is described below

commit 4e653c3dc9fec23603bc3b58ff9ba3ec95810f31
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Wed Jun 10 21:51:21 2020 +0700

    [OPENMEETINGS-2380] audio-only pod is smaller
---
 .../src/main/java/org/apache/openmeetings/web/room/raw-video.js   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-video.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-video.js
index 5d79e4a..aa2984e 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-video.js
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-video.js
@@ -240,7 +240,9 @@ var Video = (function() {
 	}
 	function _initContainer(_id, name, opts) {
 		let contSel = '#user' + sd.cuid;
-		hasVideo = VideoUtil.hasVideo(sd) || $(contSel).length < 1;
+		const _hasVideo = VideoUtil.hasVideo(sd)
+		size = {width: _hasVideo ? sd.width : 120, height: _hasVideo ? sd.height : 90};
+		hasVideo = _hasVideo || $(contSel).length < 1;
 		if (hasVideo) {
 			if (opts.interview) {
 				const area = $('.pod-area');
@@ -325,7 +327,6 @@ var Video = (function() {
 		}
 		iceServers = msg.iceServers;
 		sd.activities = sd.activities.sort();
-		size = {width: sd.width, height: sd.height};
 		isSharing = VideoUtil.isSharing(sd);
 		isRecording = VideoUtil.isRecording(sd);
 		const _id = VideoUtil.getVid(sd.uid)
@@ -388,8 +389,7 @@ var Video = (function() {
 	}
 	function __createVideo(data) {
 		const _id = VideoUtil.getVid(sd.uid);
-		_resizeDlgArea(hasVideo ? size.width : 120
-			, hasVideo ? size.height : 90);
+		_resizeDlgArea(size.width, size.height);
 		if (hasVideo && !isSharing && !isRecording) {
 			VideoUtil.setPos(v, VideoUtil.getPos(VideoUtil.getRects(VIDWIN_SEL), sd.width, sd.height + 25));
 		}