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

Avoids showing two warning dialogs when firefox extension is required and missing.

This commit is contained in:
damencho 2016-03-04 15:55:44 -06:00
parent d78666a49d
commit 3a933cfb84
1 changed files with 8 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
conference.js
View File

@ -157,23 +157,6 @@ function createLocalTracks (...devices) {
}); });
} }
/**
* Create local screen sharing track.
* Shows UI notification if Firefox extension is required.
* @returns {Promise<JitsiLocalTrack[]>}
*/
function createDesktopTrack () {
return createLocalTracks('desktop').catch(function (err) {
if (err === TrackErrors.FIREFOX_EXTENSION_NEEDED) {
APP.UI.showExtensionRequiredDialog(
config.desktopSharingFirefoxExtensionURL
);
}
return Promise.reject(err);
});
}
class ConferenceConnector { class ConferenceConnector {
constructor(resolve, reject) { constructor(resolve, reject) {
this._resolve = resolve; this._resolve = resolve;
@ -610,7 +593,7 @@ export default {
this.videoSwitchInProgress = true; this.videoSwitchInProgress = true;
if (shareScreen) { if (shareScreen) {
createDesktopTrack().then(([stream]) => { createLocalTracks('desktop').then(([stream]) => {
stream.on( stream.on(
TrackEvents.TRACK_STOPPED, TrackEvents.TRACK_STOPPED,
() => { () => {
@ -636,6 +619,13 @@ export default {
console.error('failed to share local desktop', err); console.error('failed to share local desktop', err);
if (err === TrackErrors.FIREFOX_EXTENSION_NEEDED) {
APP.UI.showExtensionRequiredDialog(
config.desktopSharingFirefoxExtensionURL
);
return;
}
let dialogTxt = APP.translation let dialogTxt = APP.translation
.generateTranslationHTML("dialog.failtoinstall"); .generateTranslationHTML("dialog.failtoinstall");
let dialogTitle = APP.translation let dialogTitle = APP.translation