webext: Changing the way content scripts are handled. Cleaner method,…

… lighter code. refs #292

webextension/manifest.json

@@ -1,38 +1,49 @@
 {
-    "manifest_version": 2,
+	"manifest_version": 2,
 
-    "name": "a11y.css",
-    "description": "a11y.css provides warnings about possible risks and mistakes that exist in HTML code through a style sheet. This extension also provides several accessibility-related utilities.",
-    "version": "1.0.1",
-    "applications": {
-        "gecko": {
-            "id": "a11y.css@ffoodd"
-        }
-    },
+	"name": "a11y.css",
+	"description": "a11y.css provides warnings about possible risks and mistakes that exist in HTML code through a style sheet. This extension also provides several accessibility-related utilities.",
+	"version": "1.0.1",
+	"applications": {
+		"gecko": {
+			"id": "a11y.css@ffoodd"
+		}
+	},
 
-    "permissions": [
-        "activeTab",
-        "storage"
-    ],
+	"permissions": [
+		"activeTab",
+		"storage"
+	],
 
-    "browser_action": {
-        "default_title": "a11y.css",
-        "default_popup": "popup/index.html",
-        "default_icon": {
-            "19": "icons/a11y-css_19.png",
-            "38": "icons/a11y-css_38.png"
-        }
-    },
-    "icons": {
-        "16": "icons/a11y-css_16.png",
-        "48": "icons/a11y-css_48.png",
-        "128": "icons/a11y-css_128.png"
+	"browser_action": {
+		"default_title": "a11y.css",
+		"default_popup": "popup/index.html",
+		"default_icon": {
+			"19": "icons/a11y-css_19.png",
+			"38": "icons/a11y-css_38.png"
+		}
+	},
+	"content_scripts": [
+		{
+			"matches": [
+				"<all_urls>"
+			],
+			"js": [
+				"/scripts/injected/checkalts.js"
+			],
+			"run_at": "document_end"
+		}
+	],
+	"icons": {
+		"16": "icons/a11y-css_16.png",
+		"48": "icons/a11y-css_48.png",
+		"128": "icons/a11y-css_128.png"
 	},
 	"web_accessible_resources": [
 		"icons/info.svg",
 		"icons/ko.svg",
-        "icons/ok.svg",
-        "scripts/injected/checkalts.js",
-        "css/*"
+		"icons/ok.svg",
+		"scripts/injected/checkalts.js",
+		"css/*"
 	]
 }

webextension/scripts/checkalts.js

@@ -1,24 +1,21 @@
 let btnCheckalts = document.getElementById('btnCheckalts');
 btnCheckalts.addEventListener('click', function () {
 
-	browser.tabs.executeScript({ file: "/scripts/injected/checkalts.js" }).then(() => {
-		let icons = [];
-		icons.ok = browser.extension.getURL("/icons/ok.svg");
-		icons.ko = browser.extension.getURL("/icons/ko.svg");
-		icons.info = browser.extension.getURL("/icons/info.svg");
-		let strings = [];
-		strings.ok = _t("altOK");
-		strings.ko = _t("altMissing");
-		strings.info = _t("altEmpty");
-		browser.tabs.query({ active: true, currentWindow: true }).then((tabs) => {
-			browser.tabs.sendMessage(tabs[0].id, {
-				a11ycss_checkalts: "checkalts",
-				icons: icons,
-				strings: strings
-			});
-
+	let icons = [];
+	icons.ok = browser.extension.getURL("/icons/ok.svg");
+	icons.ko = browser.extension.getURL("/icons/ko.svg");
+	icons.info = browser.extension.getURL("/icons/info.svg");
+	let strings = [];
+	strings.ok = _t("altOK");
+	strings.ko = _t("altMissing");
+	strings.info = _t("altEmpty");
+	browser.tabs.query({ active: true, currentWindow: true }).then((tabs) => {
+		browser.tabs.sendMessage(tabs[0].id, {
+			a11ycss_action: "checkalts",
+			icons: icons,
+			strings: strings
 		});
-
 	});
 
+
 });

webextension/scripts/injected/checkalts.js

@@ -180,8 +180,7 @@ a11ycss.checkalts = {
 };
 
 browser.runtime.onMessage.addListener((message) => {
-	if (message.a11ycss_checkalts && message.a11ycss_checkalts === "checkalts") {
-		console.log(message);
+	if (message.a11ycss_action && message.a11ycss_action === "checkalts") {
 		if(message.strings) {
 			a11ycss.checkalts.updateStrings(message.strings);
 		}