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/25 08:55:14 UTC
openmeetings git commit: [OPENMEETINGS-1699] standalone video
settings are fixed
Repository: openmeetings
Updated Branches:
refs/heads/master 13cb2edcc -> c5aa13d0c
[OPENMEETINGS-1699] standalone video settings are fixed
Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/c5aa13d0
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/c5aa13d0
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/c5aa13d0
Branch: refs/heads/master
Commit: c5aa13d0c70db41b3641d40c11aef8f828a59c03
Parents: 13cb2ed
Author: Maxim Solodovnik <so...@gmail.com>
Authored: Mon Sep 25 15:55:07 2017 +0700
Committer: Maxim Solodovnik <so...@gmail.com>
Committed: Mon Sep 25 15:55:07 2017 +0700
----------------------------------------------------------------------
.../src/main/java/org/apache/openmeetings/web/room/settings.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/c5aa13d0/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/settings.js
----------------------------------------------------------------------
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 94da35b..0dca4f3 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
@@ -78,7 +78,7 @@ var VideoSettings = (function() {
o.width = 300;
o.height = 200;
o.mode = 'settings';
- o.rights = o.rights.join();
+ o.rights = (o.rights || []).join();
delete o.keycode;
swf = initVideo(vidScroll, 'video-settings-swf', o)[0];
vs.find('input, button').prop('disabled', true);