From 29d3fdd0bf4856374fab38c5f914082c20d625a9 Mon Sep 17 00:00:00 2001 From: Evan Theurer Date: Mon, 2 Nov 2015 17:18:29 +0100 Subject: [PATCH] Change when to show the firefox extension install dialog. --- static/js/services/screensharing.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/static/js/services/screensharing.js b/static/js/services/screensharing.js index 3b202ad4..28dd9ac8 100644 --- a/static/js/services/screensharing.js +++ b/static/js/services/screensharing.js @@ -179,7 +179,9 @@ define(['underscore', 'text!partials/screensharedialogff.html', 'webrtc.adapter' this.prepare = function(options) { return selectFirefoxScreenToShare(options); }; - if (!firefoxExtension.autoinstall.force) { + if (firefoxExtension.available) { + this.supported = true; + } else if (!firefoxExtension.autoinstall.force) { this.supported = true; } } @@ -268,9 +270,7 @@ define(['underscore', 'text!partials/screensharedialogff.html', 'webrtc.adapter' }); }; firefoxExtension.detectInstalled(30000).then(function() { - if (!that.autoinstall && that.supported) { - starter(); - } + starter(); }, function(reason) { d.reject(reason); });