Merge pull request #1238 from jitsi/filmstriponly_jserrors
fix(filmstrip_only): JS errors
This commit is contained in:
commit
7dd566a591
|
@ -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
|
||||
|
|
|
@ -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);
|
||||
|
|
Loading…
Reference in New Issue