From 595885d32df68bd6aff25d11beeb4ac8d606f80e Mon Sep 17 00:00:00 2001
From: Matthew Chiam <machiam@microsoft.com>
Date: Fri, 2 Sep 2016 16:18:21 -0700
Subject: [PATCH] First attempt and reimplementing oninstalled for firefox.
 Needs to be tested

---
 .../extensions/webExtensionBase/webExtension.ts      | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/scripts/extensions/webExtensionBase/webExtension.ts b/src/scripts/extensions/webExtensionBase/webExtension.ts
index cd661490..659e1977 100644
--- a/src/scripts/extensions/webExtensionBase/webExtension.ts
+++ b/src/scripts/extensions/webExtensionBase/webExtension.ts
@@ -74,7 +74,11 @@ export class WebExtension extends ExtensionBase<WebExtensionWorker, W3CTab, numb
 	}
 
 	protected onFirstRun() {
-		// Don't do anything since we're using the onInstalled functionality instead
+		// Don't do anything since we're using the onInstalled functionality instead, unless it's not available
+		// then we use our 'missing-clipperId' heuristic
+		if (!this.onInstalledSupported()) {
+			this.onInstalled();
+		}
 	}
 
 	protected checkIfTabMatchesATooltipType(tab: W3CTab, tooltipType: TooltipType): boolean {
@@ -158,7 +162,7 @@ export class WebExtension extends ExtensionBase<WebExtensionWorker, W3CTab, numb
 
 	private registerInstallListener() {
 		// onInstalled is undefined as of Firefox 48
-		if (WebExtension.browser.runtime.onInstalled) {
+		if (this.onInstalledSupported()) {
 			WebExtension.browser.runtime.onInstalled.addListener(details => {
 				if (details.reason === "install") {
 					this.onInstalled();
@@ -175,4 +179,8 @@ export class WebExtension extends ExtensionBase<WebExtensionWorker, W3CTab, numb
 			}
 		});
 	}
+
+	private onInstalledSupported(): boolean {
+		return !!WebExtension.browser.runtime.onInstalled;
+	}
 }