shorten getRoot function

claustromaniac · Jan 17, 2019 · 7c88fda · 7c88fda
1 parent c225a02
commit 7c88fda
Showing 1 changed file with 5 additions and 9 deletions.
diff --git a/src/bg/webRequest.js b/src/bg/webRequest.js
@@ -6,21 +6,17 @@ const rIDs = {}; // tab objs by request ID
 const getRoot = host => {
 	const parts = host.split('.');
 	let root;
-	let previous = '';
 	while (parts.length > 1) {
-		previous = root;
+		const previous = root;
 		root = parts.shift();
 		const suffix = parts.join('.');
-		if (publicSuffixes.has(suffix)) {
-			previous = null;
-			break;
-		}
+		if (publicSuffixes.has(suffix)) break;
 		if (publicSuffixes.has(`*.${suffix}`)) {
-			root = null;
+			root = previous;
 			break;
 		}
 	}
-	return root || previous;	
+	return root;
 };
 const isExcluded = (origin, target) => {
 	const arr = settings.exclusions;
@@ -47,7 +43,7 @@ browser.webRequest.onBeforeSendHeaders.addListener(d => {
 		return;
 	}
 	if (
-		(d.method !== 'GET' && d.method !== 'OPTIONS') || 
+		(d.method !== 'GET' && d.method !== 'OPTIONS') ||
 		!settings.enabled
 	) return;
 	const info = tabs.getInfo(d.tabId);