Browse Source

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

j8
hristoterezov 8 years ago
parent
commit
5c9a85e928
1 changed files with 18 additions and 4 deletions
  1. 18
    4
      conference.js

+ 18
- 4
conference.js View File

@@ -894,10 +894,21 @@ export default {
894 894
                     checkAgain: () => {
895 895
                         return DSExternalInstallationInProgress;
896 896
                     },
897
-                    listener: (url) => {
898
-                        DSExternalInstallationInProgress = true;
899
-                        externalInstallation = true;
900
-                        APP.UI.showExtensionExternalInstallationDialog(url);
897
+                    listener: (status, url) => {
898
+                        switch(status) {
899
+                            case "waitingForExtension":
900
+                                DSExternalInstallationInProgress = true;
901
+                                externalInstallation = true;
902
+                                APP.UI.showExtensionExternalInstallationDialog(
903
+                                    url);
904
+                                break;
905
+                            case "extensionFound":
906
+                                if(externalInstallation) //close the dialog
907
+                                    $.prompt.close();
908
+                                break;
909
+                            default:
910
+                                //Unknown status
911
+                        }
901 912
                     }
902 913
                 }
903 914
             }).then(([stream]) => {
@@ -924,6 +935,9 @@ export default {
924 935
                     'conference.sharingDesktop.start');
925 936
                 console.log('sharing local desktop');
926 937
             }).catch((err) => {
938
+                // close external installation dialog to show the error.
939
+                if(externalInstallation)
940
+                    $.prompt.close();
927 941
                 this.videoSwitchInProgress = false;
928 942
                 this.toggleScreenSharing(false);
929 943
 

Loading…
Cancel
Save