Added support to upgrade/install extension when already running.

static/js/services/chromeextension.js

@@ -18,21 +18,30 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-define(["underscore"], function(_) {
+define(["underscore", "jquery"], function(_, $) {
 
 	// chromeExtension
 	return ["$window", "$q", function($window, $q) {
 
-		var available = false;
-		var marker = $window.document.getElementById("chromeextension-available");
-		if (marker) {
-			available = true;
-			console.log("Chrome extension is available.");
-		}
-
 		var ChromeExtension = function() {
+			this.available = false;
 			this.registry = {};
 			this.count = 0;
+			this.e = $({});
+			this.initialize();
+		};
+
+		ChromeExtension.prototype.initialize = function() {
+			var marker = $window.document.getElementById("chromeextension-available");
+			if (marker && !this.available) {
+				this.available = true;
+				console.log("Chrome extension is available.");
+				this.e.triggerHandler("available", true);
+			} else if (!marker && this.available) {
+				this.available = false;
+				console.log("Chrome extension is no longer available.");
+				this.e.triggerHandler("available", false);
+			}
 		};
 
 		ChromeExtension.prototype.call = function(data) {
@@ -75,16 +84,17 @@ define(["underscore"], function(_) {
 					console.warn("Unknown call reference received", data, this.registry, this);
 				}
 				break;
+			case "Upgrade":
+				console.log("Extension installed or upgraded", data);
+				this.initialize();
+				break;
 			default:
 				console.log("Unknown message type", data.Type, data);
 				break;
 			}
 		};
 
-		var extension;
+		var extension = new ChromeExtension();
-		if (available) {
-			extension = new ChromeExtension();
-
 		$window.addEventListener("message", function(event) {
 			//console.log("message", event.origin, event.source === window, event);
 			if (event.source === window && event.data.answer) {
@@ -93,15 +103,8 @@ define(["underscore"], function(_) {
 			}
 		});
 
-		}
+		// Expose.
-
+		return extension;
-		// public API.
-		return {
-			available: available,
-			call: function(data) {
-				return extension.call(data);
-			}
-		}
 
 	}];
 

static/js/services/screensharing.js

@@ -23,22 +23,32 @@ define(['underscore', 'webrtc.adapter'], function(_) {
 	// screensharing
 	return ["$window", "$q", "chromeExtension", function($window, $q, chromeExtension) {
 
+		var Screensharing = function() {
+			this.initialize();
+			chromeExtension.e.on("available", _.bind(function() {
+				this.initialize();
+			}, this));
+		};
+
+		Screensharing.prototype.initialize = function() {
+
 			// Check if we can do screensharing.
-		var supported = false;
+			this.supported = false;
 
 			// Define our helpers.
-		var prepare = null;
+			this.prepare = null;
-		var cancel = null;
+			this.cancel = null;
 
 			// Chrome support.
 			if ($window.webrtcDetectedBrowser === "chrome") {
+
 				if ($window.webrtcDetectedVersion >= 32 &&
 					$window.webrtcDetectedVersion < 37) {
 					// Support for flag based developer screen sharing came in Chrome 32.
 					// It was removed in Chrome 37 in favour of chrome.chooseDesktopMedia
 					// https://code.google.com/p/chromium/issues/detail?id=347641
-				supported = true;
+					this.supported = true;
-				prepare = function(options) {
+					this.prepare = function(options) {
 						// This generates constrains for the flag based screen screensharing
 						// support in Chrome 31+ to 36. Flag to be enabled is found at:
 						// chrome://flags/#enable-usermedia-screen-capture
@@ -56,9 +66,9 @@ define(['underscore', 'webrtc.adapter'], function(_) {
 				}
 
 				if (chromeExtension.available) {
-				supported = true;
+					this.supported = true;
 					var pending = null;
-				prepare = function(options) {
+					this.prepare = function(options) {
 						var select = chromeExtension.call({
 							Type: "Action",
 							Action: "chooseDesktopMedia"
@@ -87,7 +97,7 @@ define(['underscore', 'webrtc.adapter'], function(_) {
 						});
 						return d.promise;
 					};
-				cancel = function() {
+					this.cancel = function() {
 						if (pending !== null) {
 							chromeExtension.call({
 								Type: "Action",
@@ -105,24 +115,29 @@ define(['underscore', 'webrtc.adapter'], function(_) {
 				// See https://bugzilla.mozilla.org/show_bug.cgi?id=923225
 			}
 
-		// public API.
+			console.log("Screensharing support", this.supported);
-		return {
+
-			supported: supported,
+		};
-			getScreen: function(options) {
+
-				if (prepare) {
+		Screensharing.prototype.getScreen = function(options) {
-					return prepare(options);
+			if (this.prepare) {
+				return this.prepare(options);
 			} else {
 				var d = $q.defer()
 				d.reject("No implementation to get screen.");
 				return d.promise;
 			}
-			},
+		};
-			cancelGetScreen: function() {
+
-				if (cancel) {
+		Screensharing.prototype.cancelGetScreen = function() {
-					cancel();
+			if (this.cancel) {
-				}
+				this.cancel();
-			}
 			}
+		};
+
+		// Expose.
+		var screensharing = new Screensharing();
+		return screensharing;
 
 	}];