Merge pull request #1238 from jitsi/filmstriponly_jserrors

fix(filmstrip_only): JS errors
pull/1202/merge jitsi-meet_1632
Дамян Минков 8 years ago committed by GitHub
commit 7dd566a591
  1. 4
      conference.js
  2. 2
      modules/UI/videolayout/VideoLayout.js

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

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

Loading…
Cancel
Save