|
|
@@ -562,7 +562,7 @@ export default {
|
|
562
|
562
|
// FIXME If there will be microphone error it will cover any
|
|
563
|
563
|
// screensharing dialog, but it's still better than in
|
|
564
|
564
|
// the reverse order where the screensharing dialog will
|
|
565
|
|
- // sometime be closing the microphone alert ($.prompt.close();
|
|
|
565
|
+ // sometimes be closing the microphone alert ($.prompt.close();
|
|
566
|
566
|
// is called). Need to figure out dialogs chaining to fix that.
|
|
567
|
567
|
if (screenSharingError) {
|
|
568
|
568
|
this._handleScreenSharingError(screenSharingError);
|
|
|
@@ -570,7 +570,7 @@ export default {
|
|
570
|
570
|
if (audioAndVideoError || audioOnlyError) {
|
|
571
|
571
|
if (audioOnlyError || videoOnlyError) {
|
|
572
|
572
|
// If both requests for 'audio' + 'video' and 'audio'
|
|
573
|
|
- // only failed, we assume that there is some problems
|
|
|
573
|
+ // only failed, we assume that there are some problems
|
|
574
|
574
|
// with user's microphone and show corresponding dialog.
|
|
575
|
575
|
APP.UI.showDeviceErrorDialog(
|
|
576
|
576
|
audioOnlyError, videoOnlyError);
|
|
|
@@ -1307,8 +1307,9 @@ export default {
|
|
1307
|
1307
|
break;
|
|
1308
|
1308
|
}
|
|
1309
|
1309
|
case "extensionFound": {
|
|
1310
|
|
- if (externalInstallation) //close the dialog
|
|
|
1310
|
+ if (externalInstallation) { //close the dialog
|
|
1311
|
1311
|
$.prompt.close();
|
|
|
1312
|
+ }
|
|
1312
|
1313
|
break;
|
|
1313
|
1314
|
}
|
|
1314
|
1315
|
default: {
|
|
|
@@ -1317,7 +1318,7 @@ export default {
|
|
1317
|
1318
|
}
|
|
1318
|
1319
|
}
|
|
1319
|
1320
|
}
|
|
1320
|
|
- }).then(([desktopStream])=> {
|
|
|
1321
|
+ }).then(([desktopStream]) => {
|
|
1321
|
1322
|
// Stores the "untoggle" handler which remembers whether was
|
|
1322
|
1323
|
// there any video before and whether was it muted.
|
|
1323
|
1324
|
this._untoggleScreenSharing
|