This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch 4.0.x
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to refs/heads/4.0.x by this push:
new 555e54a [OPENMEETINGS-1142] JS errors in settings are displayed,
black bg display is improbed
555e54a is described below
commit 555e54a782964a976eddddded8c14910217fc6c7
Author: Maxim Solodovnik <[email protected]>
AuthorDate: Tue Jul 24 22:03:21 2018 +0700
[OPENMEETINGS-1142] JS errors in settings are displayed, black bg display
is improbed
---
openmeetings-flash/src/main/flex/main.mxml | 17 +++++------------
.../src/main/flex/org/apache/openmeetings/OmVideo.as | 12 +++++++++++-
.../java/org/apache/openmeetings/web/common/main.js | 1 +
.../org/apache/openmeetings/web/room/VideoSettings.html | 1 +
.../java/org/apache/openmeetings/web/room/settings.js | 3 +++
.../org/apache/openmeetings/web/room/video-manager.js | 6 +++---
openmeetings-web/src/main/webapp/css/room.css | 1 -
7 files changed, 24 insertions(+), 17 deletions(-)
diff --git a/openmeetings-flash/src/main/flex/main.mxml
b/openmeetings-flash/src/main/flex/main.mxml
index 14292bb..d17a2a9 100644
--- a/openmeetings-flash/src/main/flex/main.mxml
+++ b/openmeetings-flash/src/main/flex/main.mxml
@@ -89,20 +89,13 @@
return Microphone.names.length > 0;
}
- private function _hasAudio(act:Array):Boolean {
- return act.indexOf('broadcastA') > -1;
- }
private function hasAudio():Boolean {
- return _hasAudio(activities);
- }
-
- private function _hasVideo(act:Array):Boolean {
- return act.indexOf('broadcastV') > -1;
+ return OmVideo.hasAudio(activities);
}
private function hasVideo():Boolean {
- return _hasVideo(activities);
+ return OmVideo.hasVideo(activities);
}
private function hasRightRemoteControl():Boolean {
@@ -200,8 +193,8 @@
ExternalInterface.addCallback("update", function ():void {
video.getNc().call("check", new Responder(function (check:Object):void {
debug("check", check);
-
var pVideo:Boolean = hasVideo(), nVideo:Boolean =
_hasVideo(check.activities)
-
, pAudio:Boolean = hasAudio(), nAudio:Boolean =
_hasAudio(check.activities);
+
var pVideo:Boolean = hasVideo(), nVideo:Boolean =
OmVideo.hasVideo(check.activities)
+
, pAudio:Boolean = hasAudio(), nAudio:Boolean =
OmVideo.hasAudio(check.activities);
if (nVideo != pVideo || nAudio != pAudio) {
// activities are changed
activities = check.activities;
@@ -228,7 +221,7 @@
break;
case OmVideo.PLAY: {
addImage(params.width, params.height);
- _resize(params.width, params.height);
+ vidResize(params.width, params.height);
refreshCallback(null);
_updateExclusive();
_updateRemote();
diff --git
a/openmeetings-flash/src/main/flex/org/apache/openmeetings/OmVideo.as
b/openmeetings-flash/src/main/flex/org/apache/openmeetings/OmVideo.as
index 52c02c0..228ce42 100644
--- a/openmeetings-flash/src/main/flex/org/apache/openmeetings/OmVideo.as
+++ b/openmeetings-flash/src/main/flex/org/apache/openmeetings/OmVideo.as
@@ -83,7 +83,7 @@ public class OmVideo {
private function setBg():void {
var g:Graphics = ui.graphics;
- if (!!cam && !cam.muted) {
+ if ((PLAY === mode && hasVideo(params.av == null ? [] :
params.av.split(','))) || (!!cam && !cam.muted)) {
g.beginFill(0x000000, 1);
g.drawRect(0, 0, this.width, this.height);
g.endFill();
@@ -367,6 +367,7 @@ public class OmVideo {
//invokes Method in baseVideoView which shows the stream
getVideo().attachNetStream(ns);
ns.play(name);
+ setBg();
});
}
@@ -388,11 +389,20 @@ public class OmVideo {
} else {
clear();
}
+ mode = null;
ns = null;
}
public function getNc():NetConnection {
return nc;
}
+
+ public static function hasVideo(act:Array):Boolean {
+ return act.indexOf('broadcastV') > -1;
+ }
+
+ public static function hasAudio(act:Array):Boolean {
+ return act.indexOf('broadcastA') > -1;
+ }
}
}
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/main.js
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/main.js
index e910382..5780efd 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/main.js
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/main.js
@@ -81,6 +81,7 @@ var OmUtil = (function() {
const msg = JSON.stringify(m || {});
Wicket.WebSocket.send(msg);
};
+ self.initErrs = function(_e) { errs = _e; };
self.error = _error;
self.info = _info;
self.log = _log;
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/VideoSettings.html
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/VideoSettings.html
index 0cd22a3..f37a2fa 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/VideoSettings.html
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/VideoSettings.html
@@ -85,5 +85,6 @@
<wicket:message key="765"/>
</div>
</div>
+ <span id="jsNotifications"></span>
</wicket:panel>
</html>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/settings.js
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/settings.js
index f77132c..15836bc 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/settings.js
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/settings.js
@@ -31,6 +31,9 @@ var VideoSettings = (function() {
}
function _init(options) {
o = JSON.parse(JSON.stringify(options));
+ OmUtil.initErrs($('#jsNotifications').kendoNotification({
+ autoHideAfter: 20000
+ }));
vs = $('#video-settings');
lm = vs.find('.level-meter');
cam = vs.find('select.cam');
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/video-manager.js
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/video-manager.js
index dc8573c..48548d4 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/video-manager.js
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/video-manager.js
@@ -62,9 +62,9 @@ var VideoManager = (function() {
}
if (c.streams.length === 0) {
// check for non inited video window
- const v = $('#' + VideoUtil.getVid(c.uid));
- if (v.length === 1) {
- _closeV(v);
+ const vw = $('#' + VideoUtil.getVid(c.uid));
+ if (vw.length === 1) {
+ _closeV(vw);
}
}
}
diff --git a/openmeetings-web/src/main/webapp/css/room.css
b/openmeetings-web/src/main/webapp/css/room.css
index 7c6fcaa..2e2ba52 100644
--- a/openmeetings-web/src/main/webapp/css/room.css
+++ b/openmeetings-web/src/main/webapp/css/room.css
@@ -511,7 +511,6 @@
position: relative;
padding: 2px;
margin: 2px;
- overflow: hidden;
}
.pod-area .empty {
grid-area: e;
