From 5c9a85e9286b0fe86ef3384473006ded960908a4 Mon Sep 17 00:00:00 2001 From: hristoterezov Date: Thu, 25 Aug 2016 13:27:58 -0500 Subject: [PATCH] Fixes the issue with SS external installation dialog is not closed after the plugin has been installed --- conference.js | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/conference.js b/conference.js index 73f1e34ff..8f9b6584e 100644 --- a/conference.js +++ b/conference.js @@ -894,10 +894,21 @@ export default { checkAgain: () => { return DSExternalInstallationInProgress; }, - listener: (url) => { - DSExternalInstallationInProgress = true; - externalInstallation = true; - APP.UI.showExtensionExternalInstallationDialog(url); + listener: (status, url) => { + switch(status) { + case "waitingForExtension": + DSExternalInstallationInProgress = true; + externalInstallation = true; + APP.UI.showExtensionExternalInstallationDialog( + url); + break; + case "extensionFound": + if(externalInstallation) //close the dialog + $.prompt.close(); + break; + default: + //Unknown status + } } } }).then(([stream]) => { @@ -924,6 +935,9 @@ export default { 'conference.sharingDesktop.start'); console.log('sharing local desktop'); }).catch((err) => { + // close external installation dialog to show the error. + if(externalInstallation) + $.prompt.close(); this.videoSwitchInProgress = false; this.toggleScreenSharing(false);