Fix: allowListed first check as isGoogleURL & edit order & descriptio…

…n of preferences
containers-everywhere · Jan 11, 2021 · 5f30187 · 5f30187
1 parent 24f88bc
commit 5f30187
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 13 deletions.
diff --git a/background.js b/background.js
@@ -343,7 +343,11 @@ function shouldContainInto (url, tab) {
     return false;
   }
 
-  let handleUrl = isGoogleURL(url);
+  let handleUrl = isGoogleURL(url) || (extensionSettings.allowlist.length!=0 && isAllowlistedURL(url));
+
+  if (handleUrl && extensionSettings.whitelist.length!=0 && isWhitelistedURL(url)) {
+    handleUrl = false;
+  }
 
   if (handleUrl && extensionSettings.ignore_youtube && isYouTubeURL(url)) {
     handleUrl = false;
@@ -369,14 +373,6 @@ function shouldContainInto (url, tab) {
     handleUrl = false;
   }
 
-  if (handleUrl && extensionSettings.whitelist.length!=0 && isWhitelistedURL(url)) {
-    handleUrl = false;
-  }
-
-  if (!handleUrl && extensionSettings.allowlist.length!=0 && isAllowlistedURL(url)) {
-    handleUrl = true;
-  }
-
   if (handleUrl) {
     if (tab.cookieStoreId !== googleCookieStoreId) {
       if (tab.cookieStoreId !== "firefox-default" && extensionSettings.dont_override_containers) {

diff --git a/options.html b/options.html
@@ -64,20 +64,20 @@ <h1>Settings</h1>
 
 		<p>
 			<label>
-				<textarea id="whitelist" value="" cols="80">
+				<textarea id="allowlist" value="" cols="80">
 				</textarea>
 				<br>
-				Whitelisted google urls<br>
+				Allowlisted urls to use Google Container (for example third party SSO)<br>
 				<em>(Use one url per line.)</em>
 			</label>
 		</p>
 
 		<p>
 			<label>
-				<textarea id="allowlist" value="" cols="80">
+				<textarea id="whitelist" value="" cols="80">
 				</textarea>
 				<br>
-				Allowlisted urls to use Google Container<br>
+				Whitelisted urls (Google or allowlisted)<br>
 				<em>(Use one url per line.)</em>
 			</label>
 		</p>