From 7e2449ca1985226c19c50bd1a6df5acc2edd0894 Mon Sep 17 00:00:00 2001
From: Elbert Alias <elbert@alias.io>
Date: Sun, 16 Apr 2017 11:57:12 +1000
Subject: [PATCH] Fix WebExtensions options

---
 src/drivers/webextension/manifest.json | 20 +++++++++++---------
 src/drivers/webextension/options.html  |  2 +-
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/drivers/webextension/manifest.json b/src/drivers/webextension/manifest.json
index 38b9f5abb..1bc2a6e5c 100644
--- a/src/drivers/webextension/manifest.json
+++ b/src/drivers/webextension/manifest.json
@@ -26,8 +26,8 @@
 		"default_popup": "popup.html"
 	},
 	"background": {
-		"page": "background.html",
-		"persistent": true
+		"page": "background.html"
+
 	},
 	"content_scripts": [
 		{
@@ -43,11 +43,12 @@
 		},
 		{
 			"matches": [
-				"http://*/*",
+				 "http://*/*",
 				"https://*/*"
 			],
 			"js": [
-				"js/browser-polyfill.js"
+				"js/browser-polyfill.js",
+				"js/iframe.js"
 			],
 			"run_at": "document_start",
 			"all_frames": true
@@ -57,6 +58,10 @@
 		"js/inject.js"
 	],
 	"options_page": "options.html",
+	"options_ui": {
+		"page": "options.html",
+		"open_in_tab": false
+	},
 	"permissions": [
 		"tabs",
 		"webRequest",
@@ -64,9 +69,6 @@
 		"http://*/*",
 		"https://*/*"
 	],
-	"content_security_policy": "script-src 'self'; object-src 'self'",
-	"-ms-preload": {
-		"backgroundScript": "js/ms_background_scripts_api_bridge.js",
-		"contentScript": "js/ms_content_scripts_api_bridge.js"
-	}
+	"content_security_policy": "script-src 'self'; object-src 'self'"
 }
+
diff --git a/src/drivers/webextension/options.html b/src/drivers/webextension/options.html
index 4834595b2..b3a853619 100644
--- a/src/drivers/webextension/options.html
+++ b/src/drivers/webextension/options.html
@@ -29,7 +29,7 @@
 
 				<p>
 					<label for="option-upgrade-message"><input id="option-upgrade-message" type="checkbox"> <span data-i18n="optionUpgradeMessage">Tell me about upgrades</span></label>
-					<label for="option-change-icon"><input id="option-change-icon" type="checkbox"> <span data-i18n="optionChangeIcon">Change the icon in the toolbar to the first detected application instead of the Wappalyzer logo</span></label>
+					<label for="option-dynamic-icon"><input id="option-dynamic-icon" type="checkbox"> <span data-i18n="optionDynamicIcon">Use application icon instead of Wappalyzer logo</span></label>
 					<label for="option-tracking"><input id="option-tracking" type="checkbox"> <span data-i18n="optionTracking">Anonymously send reports on detected applications to wappalyzer.com for research</span></label>
 				</p>