Organize sliders into expandable summary, add first party protections section

src/js/utils.js

@@ -452,9 +452,10 @@ function isThirdPartyDomain(domain1, domain2) {
  *
  * @return {Boolean} true if the domains are third party
  */
-function firstPartyProtectionsEnabled(domain, badger) {
-  // if the firstparties list hasn't been set yet, fetch it and set it
-  if (!badger.firstPartiesList) {
+let firstPartyProtectionsEnabled = (function () {
+  let firstPartiesList;
+
+  function getFirstParties() {
     let manifestJson = chrome.runtime.getManifest();
     let firstParties = [];
 
@@ -468,23 +469,26 @@ function firstPartyProtectionsEnabled(domain, badger) {
         firstParties.push(extractedUrls);
       }
     }
-    // clean up the gathered sets of url matches into a single flat list
-    badger.firstPartiesList = [].concat.apply([], firstParties);
+    return [].concat.apply([], firstParties);
   }
-  // check for presence of given domain in firstparties list
-  for (let url_pattern of badger.firstPartiesList) {
-    // account for wildcards in entries on firstPartiesList & avoid false positives
-    if (url_pattern.startsWith("*")) {
-      // compare against pattern without '*.' and the domain without 'www.'
-      if (url_pattern.slice(2) == domain.slice(4)) {
+
+  return function (tab_host) {
+    if (!firstPartiesList) {
+      firstPartiesList = getFirstParties();
+    }
+
+    for (let url_pattern of firstPartiesList) {
+      if (url_pattern.startsWith("*")) {
+        if ((url_pattern.slice(2) == tab_host.slice(4)) || url_pattern.slice(2) == tab_host.slice(2)) {
+          return true;
+        }
+      } else if (url_pattern == tab_host) {
         return true;
       }
-    } else if (url_pattern == domain) {
-      return true;
     }
-  }
-  return false;
-}
+    return false;
+  };
+})();
 
 /**
  * Checks whether a given URL is a special browser page.

src/js/webrequest.js

@@ -1021,7 +1021,7 @@ function dispatcher(request, sender, sendResponse) {
     let tab_host = window.extractHostFromURL(request.tabUrl),
       origins = badger.tabData[tab_id].origins,
       cookieblocked = {},
-      isOnFirstParty = utils.firstPartyProtectionsEnabled(tab_host, badger);
+      isOnFirstParty = utils.firstPartyProtectionsEnabled(tab_host);
 
     for (let origin in origins) {
       // see if origin would be cookieblocked if not for user override

src/tests/tests/utils.js

@@ -573,19 +573,19 @@ QUnit.test("estimateMaxEntropy", assert => {
 
 QUnit.test("firstPartyProtectionsEnabled", assert => {
   assert.equal(
-    utils.firstPartyProtectionsEnabled("www.google.com", badger),
+    utils.firstPartyProtectionsEnabled("www.google.com"),
     true,
     "properly identifies a url pattern from our firstparties list"
   );
 
   assert.equal(
-    utils.firstPartyProtectionsEnabled("foobar.com", badger),
+    utils.firstPartyProtectionsEnabled("foobar.com"),
     false,
     "determines that a url not in the firstparties list is not protected by a firstparty script"
   );
 
   assert.equal(
-    utils.firstPartyProtectionsEnabled("www.messenger.com", badger),
+    utils.firstPartyProtectionsEnabled("www.messenger.com"),
     true,
     "accurately IDs a site with firstparty protections covered by a wildcard url match"
   );