From ca62f9bec29d766885c7062cb12e65c3271ed2e8 Mon Sep 17 00:00:00 2001 From: damencho Date: Tue, 7 Jun 2016 13:38:47 -0500 Subject: [PATCH 1/3] 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 2/3] 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 3/3] 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);