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

Fixes the issue with SS external installation dialog is not closed after the plugin has been installed

This commit is contained in:
hristoterezov 2016-08-25 13:27:58 -05:00
parent 49cc4ae087
commit 5c9a85e928
1 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
conference.js
View File

@ -894,10 +894,21 @@ export default {
checkAgain: () => { checkAgain: () => {
return DSExternalInstallationInProgress; return DSExternalInstallationInProgress;
}, },
listener: (url) => { listener: (status, url) => {
switch(status) {
case "waitingForExtension":
DSExternalInstallationInProgress = true; DSExternalInstallationInProgress = true;
externalInstallation = true; externalInstallation = true;
APP.UI.showExtensionExternalInstallationDialog(url); APP.UI.showExtensionExternalInstallationDialog(
url);
break;
case "extensionFound":
if(externalInstallation) //close the dialog
$.prompt.close();
break;
default:
//Unknown status
}
} }
} }
}).then(([stream]) => { }).then(([stream]) => {
@ -924,6 +935,9 @@ export default {
'conference.sharingDesktop.start'); 'conference.sharingDesktop.start');
console.log('sharing local desktop'); console.log('sharing local desktop');
}).catch((err) => { }).catch((err) => {
// close external installation dialog to show the error.
if(externalInstallation)
$.prompt.close();
this.videoSwitchInProgress = false; this.videoSwitchInProgress = false;
this.toggleScreenSharing(false); this.toggleScreenSharing(false);