From 0f9bc766db027000a3a2566b0dda3cdd3a063495 Mon Sep 17 00:00:00 2001 From: hristoterezov Date: Wed, 11 Jan 2017 16:43:21 -0600 Subject: [PATCH] fix(filmstrip_only): JS errors --- conference.js | 4 +++- modules/UI/videolayout/VideoLayout.js | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/conference.js b/conference.js index cc1db96eb..96676dc4d 100644 --- a/conference.js +++ b/conference.js @@ -506,8 +506,10 @@ export default { this.isDesktopSharingEnabled = JitsiMeetJS.isDesktopSharingEnabled(); - if (UIUtil.isButtonEnabled('contacts')) + if (UIUtil.isButtonEnabled('contacts') + && !interfaceConfig.filmStripOnly) { APP.UI.ContactList = new ContactList(room); + } // if user didn't give access to mic or camera or doesn't have // them at all, we disable corresponding toolbar buttons diff --git a/modules/UI/videolayout/VideoLayout.js b/modules/UI/videolayout/VideoLayout.js index d8d4b3bac..9f80bc017 100644 --- a/modules/UI/videolayout/VideoLayout.js +++ b/modules/UI/videolayout/VideoLayout.js @@ -636,7 +636,7 @@ var VideoLayout = { // Update the large video if the video source is already available, // otherwise wait for the "videoactive.jingle" event. // FIXME: there is no "videoactive.jingle" event. - if (!pinnedId + if (!interfaceConfig.filmStripOnly && !pinnedId && remoteVideo.hasVideoStarted() && !this.getCurrentlyOnLargeContainer().stayOnStage()) { this.updateLargeVideo(id);