From 5d9d6b4642bdc5ce0281494f29481697180dfbfd Mon Sep 17 00:00:00 2001 From: Etienne CHAMPETIER Date: Wed, 1 Jun 2016 15:35:18 +0200 Subject: [PATCH 1/7] Fix missing base.html in source-package Signed-off-by: Etienne CHAMPETIER --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 86da9f6f5..1f190e065 100644 --- a/Makefile +++ b/Makefile @@ -48,7 +48,7 @@ uglify: source-package: mkdir -p source_package/jitsi-meet/css && \ - cp -r *.js connection_optimization favicon.ico fonts images index.html libs plugin.*html sounds title.html unsupported_browser.html LICENSE lang source_package/jitsi-meet && \ + cp -r *.js *.html connection_optimization favicon.ico fonts images libs sounds LICENSE lang source_package/jitsi-meet && \ cp css/all.css source_package/jitsi-meet/css && \ cp css/unsupported_browser.css source_package/jitsi-meet/css && \ (cd source_package ; tar cjf ../jitsi-meet.tar.bz2 jitsi-meet) && \ From f883199f4fcc9dab1ca27c51d07315cdd05f1c83 Mon Sep 17 00:00:00 2001 From: Aaron Ogle Date: Mon, 6 Jun 2016 21:56:07 -0500 Subject: [PATCH 2/7] Switch to https on iframe creation --- external_api.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external_api.js b/external_api.js index 3ad7a5980..eff65bd54 100644 --- a/external_api.js +++ b/external_api.js @@ -50,7 +50,7 @@ var JitsiMeetExternalAPI = (function() if(height) this.iframeHolder.style.height = height + "px"; this.frameName = "jitsiConferenceFrame" + JitsiMeetExternalAPI.id; - this.url = "//" + domain + "/"; + this.url = "https://" + domain + "/"; if(room_name) this.url += room_name; this.url += "#external=true"; From 81437263b465473efc4017204b24e9234624a8e1 Mon Sep 17 00:00:00 2001 From: Aaron Ogle Date: Mon, 6 Jun 2016 23:06:37 -0500 Subject: [PATCH 3/7] Allow ssl variable to force https:// on the iframe --- external_api.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/external_api.js b/external_api.js index eff65bd54..26688ac60 100644 --- a/external_api.js +++ b/external_api.js @@ -25,10 +25,11 @@ var JitsiMeetExternalAPI = (function() * @param parent_node the node that will contain the iframe * @param filmStripOnly if the value is true only the small videos will be * visible. + * @param ssl if the value is true https will be used on the iframe * @constructor */ function JitsiMeetExternalAPI(domain, room_name, width, height, parentNode, - configOverwrite, interfaceConfigOverwrite) { + configOverwrite, interfaceConfigOverwrite, ssl) { if (!width || width < MIN_WIDTH) width = MIN_WIDTH; if (!height || height < MIN_HEIGHT) @@ -50,7 +51,7 @@ var JitsiMeetExternalAPI = (function() if(height) this.iframeHolder.style.height = height + "px"; this.frameName = "jitsiConferenceFrame" + JitsiMeetExternalAPI.id; - this.url = "https://" + domain + "/"; + this.url = (ssl) ? "https:" : "" +"//" + domain + "/"; if(room_name) this.url += room_name; this.url += "#external=true"; From 98919e09964234bdffb3183bb73e86f83d3a7e64 Mon Sep 17 00:00:00 2001 From: Aaron Ogle Date: Tue, 7 Jun 2016 14:08:02 -0500 Subject: [PATCH 4/7] Changed variable from ssl to noSsl Defaults to SSL, only if the noSsl flag is true will it use http --- external_api.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/external_api.js b/external_api.js index 26688ac60..2a858dbd8 100644 --- a/external_api.js +++ b/external_api.js @@ -25,11 +25,11 @@ var JitsiMeetExternalAPI = (function() * @param parent_node the node that will contain the iframe * @param filmStripOnly if the value is true only the small videos will be * visible. - * @param ssl if the value is true https will be used on the iframe + * @param noSsl if the value is true https won't be used * @constructor */ function JitsiMeetExternalAPI(domain, room_name, width, height, parentNode, - configOverwrite, interfaceConfigOverwrite, ssl) { + configOverwrite, interfaceConfigOverwrite, noSsl) { if (!width || width < MIN_WIDTH) width = MIN_WIDTH; if (!height || height < MIN_HEIGHT) @@ -51,7 +51,7 @@ var JitsiMeetExternalAPI = (function() if(height) this.iframeHolder.style.height = height + "px"; this.frameName = "jitsiConferenceFrame" + JitsiMeetExternalAPI.id; - this.url = (ssl) ? "https:" : "" +"//" + domain + "/"; + this.url = (noSsl) ? "http" : "https" +"://" + domain + "/"; if(room_name) this.url += room_name; this.url += "#external=true"; From ca62f9bec29d766885c7062cb12e65c3271ed2e8 Mon Sep 17 00:00:00 2001 From: damencho Date: Tue, 7 Jun 2016 13:38:47 -0500 Subject: [PATCH 5/7] Adds a check to make follow me work without etherpad enabled. --- modules/FollowMe.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/modules/FollowMe.js b/modules/FollowMe.js index a4b18f812..fe6269162 100644 --- a/modules/FollowMe.js +++ b/modules/FollowMe.js @@ -154,9 +154,10 @@ class FollowMe { this._nextOnStage(smallVideo, isPinned); - this._sharedDocumentToggled - .bind(this, this._UI.getSharedDocumentManager().isVisible()); - + // check whether shared document is enabled/initialized + if(this._UI.getSharedDocumentManager()) + this._sharedDocumentToggled + .bind(this, this._UI.getSharedDocumentManager().isVisible()); } /** From 955e01a750c1aa599e8aef48380857f194aa60f5 Mon Sep 17 00:00:00 2001 From: damencho Date: Tue, 7 Jun 2016 16:38:21 -0500 Subject: [PATCH 6/7] Adds comments for processing nextOnStage. --- modules/FollowMe.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/FollowMe.js b/modules/FollowMe.js index fe6269162..8457b8e79 100644 --- a/modules/FollowMe.js +++ b/modules/FollowMe.js @@ -353,10 +353,13 @@ class FollowMe { _onNextOnStage(id) { var clickId = null; var pin; + // if there is an id which is not pinned we schedule it for pin only the + // first time if(typeof id !== 'undefined' && !VideoLayout.isPinned(id)) { clickId = id; pin = true; } + // if there is no id, but we have a pinned one, let's unpin else if (typeof id == 'undefined' && VideoLayout.getPinnedId()) { clickId = VideoLayout.getPinnedId(); pin = false; From 165507b83a40012b609ebb4b308d95dc50974316 Mon Sep 17 00:00:00 2001 From: damencho Date: Tue, 7 Jun 2016 16:40:43 -0500 Subject: [PATCH 7/7] Removes printing audio levels by default in debug mode and makes it optional. --- conference.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/conference.js b/conference.js index 1c7d1b93d..14cfe1c35 100644 --- a/conference.js +++ b/conference.js @@ -1178,7 +1178,8 @@ export default { if(config.debug) { this.audioLevelsMap[id] = lvl; - console.log("AudioLevel:" + id + "/" + lvl); + if(config.debugAudioLevels) + console.log("AudioLevel:" + id + "/" + lvl); } APP.UI.setAudioLevel(id, lvl);