Fixes autoEnableDesktopSharing option.

This commit is contained in:
damencho 2016-02-04 12:43:02 -06:00
parent 9ebf4bfacb
commit 4228537390
1 changed files with 4 additions and 1 deletions

5
app.js
View File

@ -75,6 +75,10 @@ function init() {
var isUIReady = APP.UI.start(); var isUIReady = APP.UI.start();
if (isUIReady) { if (isUIReady) {
APP.conference.init({roomName: buildRoomName()}).then(function () { APP.conference.init({roomName: buildRoomName()}).then(function () {
// init desktop before UI, in order to make sure
// autoEnableDesktopSharing works
APP.desktopsharing.init(JitsiMeetJS.isDesktopSharingEnabled());
APP.UI.initConference(); APP.UI.initConference();
APP.UI.addListener(UIEvents.LANG_CHANGED, function (language) { APP.UI.addListener(UIEvents.LANG_CHANGED, function (language) {
@ -82,7 +86,6 @@ function init() {
APP.settings.setLanguage(language); APP.settings.setLanguage(language);
}); });
APP.desktopsharing.init(JitsiMeetJS.isDesktopSharingEnabled());
APP.keyboardshortcut.init(); APP.keyboardshortcut.init();
}).catch(function (err) { }).catch(function (err) {
console.error(err); console.error(err);