Browse Source

fix(filmstrip_only): JS errors

j8
hristoterezov 8 years ago
parent
commit
0f9bc766db
2 changed files with 4 additions and 2 deletions
  1. 3
    1
      conference.js
  2. 1
    1
      modules/UI/videolayout/VideoLayout.js

+ 3
- 1
conference.js View File

506
                 this.isDesktopSharingEnabled =
506
                 this.isDesktopSharingEnabled =
507
                     JitsiMeetJS.isDesktopSharingEnabled();
507
                     JitsiMeetJS.isDesktopSharingEnabled();
508
 
508
 
509
-                if (UIUtil.isButtonEnabled('contacts'))
509
+                if (UIUtil.isButtonEnabled('contacts')
510
+                    && !interfaceConfig.filmStripOnly) {
510
                     APP.UI.ContactList = new ContactList(room);
511
                     APP.UI.ContactList = new ContactList(room);
512
+                }
511
 
513
 
512
                 // if user didn't give access to mic or camera or doesn't have
514
                 // if user didn't give access to mic or camera or doesn't have
513
                 // them at all, we disable corresponding toolbar buttons
515
                 // them at all, we disable corresponding toolbar buttons

+ 1
- 1
modules/UI/videolayout/VideoLayout.js View File

636
         // Update the large video if the video source is already available,
636
         // Update the large video if the video source is already available,
637
         // otherwise wait for the "videoactive.jingle" event.
637
         // otherwise wait for the "videoactive.jingle" event.
638
         // FIXME: there is no "videoactive.jingle" event.
638
         // FIXME: there is no "videoactive.jingle" event.
639
-        if (!pinnedId
639
+        if (!interfaceConfig.filmStripOnly && !pinnedId
640
             && remoteVideo.hasVideoStarted()
640
             && remoteVideo.hasVideoStarted()
641
             && !this.getCurrentlyOnLargeContainer().stayOnStage()) {
641
             && !this.getCurrentlyOnLargeContainer().stayOnStage()) {
642
             this.updateLargeVideo(id);
642
             this.updateLargeVideo(id);

Loading…
Cancel
Save