haskal
/
jiti-meet
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #679 from damencho/follow-me 

Fixes follow-me to work without etherpad
This commit is contained in:
yanas 2016-06-07 17:01:45 -05:00
parent c82bf2a19c 165507b83a
commit 346ff889ea
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
conference.js
View File

@ -1178,7 +1178,8 @@ export default {
if(config.debug) if(config.debug)
{ {
this.audioLevelsMap[id] = lvl; this.audioLevelsMap[id] = lvl;
console.log("AudioLevel:" + id + "/" + lvl); if(config.debugAudioLevels)
console.log("AudioLevel:" + id + "/" + lvl);
} }
APP.UI.setAudioLevel(id, lvl); APP.UI.setAudioLevel(id, lvl);

10
modules/FollowMe.js
View File

@ -154,9 +154,10 @@ class FollowMe {
this._nextOnStage(smallVideo, isPinned); this._nextOnStage(smallVideo, isPinned);
this._sharedDocumentToggled // check whether shared document is enabled/initialized
.bind(this, this._UI.getSharedDocumentManager().isVisible()); if(this._UI.getSharedDocumentManager())
this._sharedDocumentToggled
.bind(this, this._UI.getSharedDocumentManager().isVisible());
} }
/** /**
@ -352,10 +353,13 @@ class FollowMe {
_onNextOnStage(id) { _onNextOnStage(id) {
var clickId = null; var clickId = null;
var pin; 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)) { if(typeof id !== 'undefined' && !VideoLayout.isPinned(id)) {
clickId = id; clickId = id;
pin = true; pin = true;
} }
// if there is no id, but we have a pinned one, let's unpin
else if (typeof id == 'undefined' && VideoLayout.getPinnedId()) { else if (typeof id == 'undefined' && VideoLayout.getPinnedId()) {
clickId = VideoLayout.getPinnedId(); clickId = VideoLayout.getPinnedId();
pin = false; pin = false;