Sfoglia il codice sorgente

Merge pull request #1238 from jitsi/filmstriponly_jserrors

fix(filmstrip_only): JS errors
j8
Дамян Минков 8 anni fa
parent
commit
7dd566a591
2 ha cambiato i file con 4 aggiunte e 2 eliminazioni
  1. 3
    1
      conference.js
  2. 1
    1
      modules/UI/videolayout/VideoLayout.js

+ 3
- 1
conference.js Vedi File

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

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

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

Loading…
Annulla
Salva