Browse Source

Keep dialog from displaying when installation of the chrome screensharing extension is declined (FS#1696).

pull/250/head
Evan Theurer 10 years ago
parent
commit
7b9e974611
  1. 17
      static/js/directives/screenshare.js

17
static/js/directives/screenshare.js

@ -180,8 +180,21 @@ define(['jquery', 'underscore', 'text!partials/screenshare.html', 'text!partials
$scope.stopScreenshare(); $scope.stopScreenshare();
} }
}, function(err) { }, function(err) {
console.log("Screen sharing request returned error", err); var errMsg = '';
alertify.dialog.alert(translation._("Failed to start screen sharing (%s).", err)); var errCode = '';
if (err && err.detail) {
errMsg = err.detail;
errCode = err.errorCode;
} else {
errMsg = err;
}
console.log("Screen sharing request returned error", errMsg);
// Do not display error dialog when user cancelled action of
// chrome extension installation
// https://developer.chrome.com/extensions/webstore#type-ErrorCode
if (errCode !== 'userCancelled') {
alertify.dialog.alert(translation._("Failed to start screen sharing (%s).", errMsg));
}
$scope.stopScreenshare(); $scope.stopScreenshare();
}); });

Loading…
Cancel
Save