Browse Source

Fixing screen sharing auto start after inline install.

pull/79/head
Simon Eisenmann 11 years ago
parent
commit
669c47b57c
  1. 13
      static/js/services/screensharing.js

13
static/js/services/screensharing.js

@ -125,11 +125,6 @@ define(['underscore', 'webrtc.adapter'], function(_) { @@ -125,11 +125,6 @@ define(['underscore', 'webrtc.adapter'], function(_) {
var d = $q.defer();
var install = chromeExtension.autoinstall.install();
install.then(function() {
that.initialize();
if (that.autoinstall) {
// We are still on auto install - must have failed.
d.reject("Auto install failed");
} else {
// Seems we triggered install - this can take a while.
console.log("Auto install success");
waiting = true;
@ -156,8 +151,12 @@ define(['underscore', 'webrtc.adapter'], function(_) { @@ -156,8 +151,12 @@ define(['underscore', 'webrtc.adapter'], function(_) {
}, 0);
});
}
}, 0);
}
}, 100);
// Add a timeout of 30 seconds.
$timeout(function() {
waiting = false;
d.reject("Timeout while waiting for extension getting installed");
}, 30000);
}, function(err) {
d.reject(err);
});

Loading…
Cancel
Save