haskal
/
jiti-meet
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This commit is contained in:
Lyubomir Marinov 2017-01-12 10:37:36 -06:00
parent 0912dbf130 7dd566a591
commit 0936d54114
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
conference.js
View File

@ -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

2
modules/UI/videolayout/VideoLayout.js
View File

@ -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);