Merge branch 'master' into BeatC-BeatC-moving-conference-init-to-react-1

jitsi · Jan 12, 2017 · 0936d54 · 0936d54
2 parents 0912dbf + 7dd566a
commit 0936d54
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git 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
@@ -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);