Browse Source

Added support to force extension auto install.

pull/80/head
Simon Eisenmann 11 years ago
parent
commit
7b6126adb9
  1. 3
      static/js/services/chromeextension.js
  2. 9
      static/js/services/screensharing.js

3
static/js/services/chromeextension.js

@ -95,10 +95,11 @@ define(["underscore", "jquery", "webrtc.adapter"], function(_, $) { @@ -95,10 +95,11 @@ define(["underscore", "jquery", "webrtc.adapter"], function(_, $) {
}
};
ChromeExtension.prototype.registerAutoInstall = function(installFunc, cancelInstallFunc) {
ChromeExtension.prototype.registerAutoInstall = function(installFunc, cancelInstallFunc, force) {
this.autoinstall.install = installFunc;
this.autoinstall.cancel = cancelInstallFunc;
this.autoinstall.force = !!force;
if (!this.available && installFunc) {
this.e.triggerHandler("available", true);
}

9
static/js/services/screensharing.js

@ -67,6 +67,7 @@ define(['underscore', 'webrtc.adapter'], function(_) { @@ -67,6 +67,7 @@ define(['underscore', 'webrtc.adapter'], function(_) {
}
if (chromeExtension.available) {
this.supported = true;
var pending = null;
this.prepare = function(options) {
@ -108,6 +109,14 @@ define(['underscore', 'webrtc.adapter'], function(_) { @@ -108,6 +109,14 @@ define(['underscore', 'webrtc.adapter'], function(_) {
pending = null;
}
};
} else {
// Check if we always should do autoinstall if the extension is not there.
if (chromeExtension.autoinstall.force) {
this.supported = false;
}
}
} else {

Loading…
Cancel
Save