Refactored contentScript.js

contentScript.js

@@ -1,14 +1,10 @@
-window.onload = () => {
-	chrome.storage.sync.get([ "matchingPatterns", "exclusionPatterns", "mode" ],
-	(result) => {
-		killStickyIfMatch(result);
-	});
-};
-
-function killStickyIfMatch(result) {
-	if (typeof result.matchingPatterns == "undefined") return;
+/***********/
+/* HELPERS */
+/***********/
 
+function checkForShouldKillSticky(result) {
 	var shouldKillSticky = false;
+	
 	let matchingPatterns = result.mode == "whitelist" ?
 						   [ ".*" ] :
 						   (typeof result.matchingPatterns != "undefined" ?
@@ -33,6 +29,26 @@ function killStickyIfMatch(result) {
 			break;
 		}
 	}
-	if (!shouldKillSticky) return;
-	killSticky();
+	
+	return shouldKillSticky;
+}
+
+function updateIcon(result) {
+	// TODO: code!
+}
+
+/******************/
+/* INITIALIZATION */
+/******************/
+
+function initialize() {
+	chrome.storage.sync.get([ "matchingPatterns", "exclusionPatterns", "mode" ],
+	(result) => {
+		let shouldKillSticky = checkForShouldKillSticky(result);
+		updateIcon(result);
+		window.onload = () => {
+			if (shouldKillSticky) killSticky();
+		};
+	});
 }
+initialize();