Refactored some functions and made formatting consistent

PyvesB · Nov 27, 2017 · d401d16 · d401d16
1 parent 46ab9ca
commit d401d16
Show file tree

Hide file tree

Showing 7 changed files with 512 additions and 526 deletions.
diff --git a/background/background.js b/background/background.js
@@ -1,57 +1,51 @@
 // All tabs execute the content scripts and check for videos. This avoids having
 // to reload them or restart the browser. Displays an update notification.
 chrome.runtime.onInstalled.addListener(function(details) {
-	// Firefox automatically injects scripts on install, Chrome and Opera don't.
-	if (typeof InstallTrigger === 'undefined') {
-		injectScripts();
-	}
-	if (details.reason === "update") {
-		chrome.notifications.create("update_notification", {
-			title : chrome.i18n.getMessage("update_title"),
-			message : chrome.i18n.getMessage("update_message", [ chrome.runtime.getManifest().version ]),
-			type : "basic",
-			iconUrl : "icons/icon-large.png"
-		})
-	}
-	console.info("Extension version " + chrome.runtime.getManifest().version + " successfully installed");
+  // Firefox automatically injects scripts on install, Chrome and Opera don't.
+  if (typeof InstallTrigger === 'undefined') {
+    injectScripts();
+  }
+  if (details.reason === "update") {
+    chrome.notifications.create("update_notification", {
+      title : chrome.i18n.getMessage("update_title"),
+      message : chrome.i18n.getMessage("update_message", [ chrome.runtime.getManifest().version ]),
+      type : "basic",
+      iconUrl : "icons/icon-large.png"
+    })
+  }
+  console.info("Extension version " + chrome.runtime.getManifest().version + " successfully installed");
 });
 
 // Modifies the tab icon when a tab containing a video notifies the background
 // whether video tuning is active or not.
 chrome.runtime.onMessage.addListener(function(request, sender) {
-	if (request.active) {
-		chrome.browserAction.setIcon({
-			path : "icons/icon-play.png",
-			tabId : sender.tab.id
-		});
-	} else {
-		chrome.browserAction.setIcon({
-			path : "icons/icon-pause.png",
-			tabId : sender.tab.id
-		});
-	}
+  const iconName = request.active ? "play" : "pause";
+  chrome.browserAction.setIcon({
+    path : "icons/icon-" + iconName + ".png",
+    tabId : sender.tab.id
+  });
 });
 
 function injectScripts() {
-	chrome.tabs.query({}, function(tabs) {
-		tabs.forEach(function(tab) {
-			// Executing a content script on chrome://, ftp:// or file:// URLs
-			// is not allowed and would throw an exception.
-			if (!tab.url.startsWith("chrome://") && !tab.url.startsWith("ftp://") && !tab.url.startsWith("file://")) {
-				chrome.tabs.executeScript(tab.id, {
-					allFrames : true,
-					file : "filters/filters.js"
-				}, function() {
-					if (typeof chrome.runtime.lastError !== "undefined") {
-						console.warn("Could not execute Night Video Tuner script in tab with url " + tab.url);
-					} else {
-						chrome.tabs.executeScript(tab.id, {
-							allFrames : true,
-							file : "content/content.js"
-						});
-					}
-				});
-			}
-		});
-	});
-}
+  chrome.tabs.query({}, function(tabs) {
+    tabs.forEach(function(tab) {
+      // Executing a content script on chrome://, ftp:// or file:// URLs
+      // is not allowed and would throw an exception.
+      if (!tab.url.startsWith("chrome://") && !tab.url.startsWith("ftp://") && !tab.url.startsWith("file://")) {
+        chrome.tabs.executeScript(tab.id, {
+          allFrames : true,
+          file : "filters/filters.js"
+        }, function() {
+          if (typeof chrome.runtime.lastError !== "undefined") {
+            console.warn("Could not execute Night Video Tuner script in tab with url " + tab.url);
+          } else {
+            chrome.tabs.executeScript(tab.id, {
+              allFrames : true,
+              file : "content/content.js"
+            });
+          }
+        });
+      }
+    });
+  });
+}