Organize sliders into expandable summary, add first party protections section

src/_locales/en_US/messages.json

@@ -417,6 +417,22 @@
         "message": "user-controlled",
         "description": "Dropdown control setting on the Tracking Domains options page tab."
     },
+    "popup_info_firstparty_protections": {
+        "message": "Link tracking protection active",
+        "description": "Clickable status header text in the popup. Shown when Privacy Badger's link tracking protection is active (for example, on facebook.com)."
+    },
+    "popup_info_firstparty_description": {
+        "message": "Some websites, such as the one you're on right now, $LINK_START$use link tracking to follow you$LINK_END$ whenever you click a link to leave the website. Privacy Badger removes this link tracking.",
+        "description": "Text revealed by clicking on the link tracking protection header in the popup",
+        "placeholders": {
+            "link_start": {
+                "content": "<a href='https://privacybadger.org/#What-about-tracking-by-the-sites-I-actively-visit%2c-like-NYTimes.com-or-Facebook.com' target='_blank'>"
+            },
+            "link_end": {
+                "content": "</a>"
+            }
+        }
+    },
     "popup_instructions": {
         "message": "$COUNT$ potential $LINK_START$trackers$LINK_END$ blocked",
         "description": "Popup message shown when at least one tracker was blocked.",

src/js/background.js

@@ -815,6 +815,7 @@ Badger.prototype = {
     seenComic: false,
     sendDNTSignal: true,
     showCounter: true,
+    showExpandedTrackingSection: false,
     showIntroPage: true,
     showNonTrackingDomains: false,
     showTrackingDomains: false,

src/js/popup.js

@@ -194,6 +194,37 @@ function init() {
     chrome.i18n.getMessage("version", chrome.runtime.getManifest().version)
   );
 
+  // add event listeners for click-to-expand blocked resources popup section
+  $('#tracker-list-header').on('click', toggleBlockedResourcesHandler);
+
+  // add event listeners for click-to-expand first party protections popup section
+  $('#firstparty-protections-header').on('click', toggleFirstPartyInfoHandler);
+
+  if (POPUP_DATA.showExpandedTrackingSection) {
+    $('#expand-blocked-resources').hide();
+    $('#collapse-blocked-resources').show();
+    $('#blockedResources').show();
+  } else {
+    $('#expand-blocked-resources').show();
+    $('#collapse-blocked-resources').hide();
+    // show sliders regardless when the button
+    // that lets you toggle slider visibility
+    // isn't shown for whatever reason
+    // (for ex.: "no trackers blocked" but we need to show
+    // one or more "don't appear to be tracking you" sliders)
+    if (!$('#tracker-list-header').is(':visible')) {
+      $('#blockedResources').show();
+    } else {
+      $('#blockedResources').hide();
+    }
+  }
+
+  // show firstparty protections message if current tab is in our content scripts
+  if (POPUP_DATA.enabled && POPUP_DATA.isOnFirstParty) {
+    $("#firstparty-protections-container").show();
+    $('#expand-firstparty-popup').show();
+  }
+
   // improve on Firefox's built-in options opening logic
   if (typeof browser == "object" && typeof browser.runtime.getBrowserInfo == "function") {
     browser.runtime.getBrowserInfo().then(function (info) {
@@ -436,6 +467,48 @@ function share() {
   $("#share_output").val(share_msg);
 }
 
+/**
+ * Click handlers for showing/hiding the blocked resources section
+ */
+function toggleBlockedResourcesHandler(e) {
+  if (e.target.nodeName.toLowerCase() == 'a') {
+    // don't toggle contents when clicking links in the header
+    return;
+  }
+  if ($("#expand-blocked-resources").is(":visible")) {
+    $("#collapse-blocked-resources").show();
+    $("#expand-blocked-resources").hide();
+    $("#blockedResources").slideDown();
+    chrome.runtime.sendMessage({
+      type: "updateSettings",
+      data: { showExpandedTrackingSection: true }
+    });
+  } else {
+    $("#collapse-blocked-resources").hide();
+    $("#expand-blocked-resources").show();
+    $("#blockedResources").slideUp();
+    chrome.runtime.sendMessage({
+      type: "updateSettings",
+      data: { showExpandedTrackingSection: false }
+    });
+  }
+}
+
+/**
+ * Click handler for showing/hiding the firstparty popup info text
+ */
+function toggleFirstPartyInfoHandler() {
+  if ($('#collapse-firstparty-popup').is(":visible")) {
+    $("#collapse-firstparty-popup").hide();
+    $("#expand-firstparty-popup").show();
+    $("#instructions-firstparty-description").slideUp();
+  } else {
+    $("#collapse-firstparty-popup").show();
+    $("#expand-firstparty-popup").hide();
+    $("#instructions-firstparty-description").slideDown();
+  }
+}
+
 /**
  * Handler to undo user selection for a tracker
  */
@@ -563,9 +636,6 @@ function refreshPopup() {
         htmlUtils.getOriginHtml(domain, constants.ALLOW)
       );
     });
-
-    // reduce margin if we have hasn't-decided-yet-to-block domains to show
-    $("#instructions-no-trackers").css("margin", "10px 0");
   }
 
   if (POPUP_DATA.learnLocally && POPUP_DATA.showNonTrackingDomains && nonTracking.length) {
@@ -581,9 +651,6 @@ function refreshPopup() {
         htmlUtils.getOriginHtml(nonTracking[i], constants.NO_TRACKING)
       );
     }
-
-    // reduce margin if we have non-tracking domains to show
-    $("#instructions-no-trackers").css("margin", "10px 0");
   }
 
   if (printable.length) {
@@ -602,6 +669,7 @@ function refreshPopup() {
     $("#instructions-no-trackers").show();
 
   } else {
+    $('#tracker-list-header').show();
     $('#instructions-many-trackers').html(chrome.i18n.getMessage(
       "popup_instructions", [
         POPUP_DATA.trackerCount,

src/js/utils.js

@@ -445,6 +445,50 @@ function isThirdPartyDomain(domain1, domain2) {
   return false;
 }
 
+/**
+ * checks to see if a given url has firstparty protections scripts run on it
+ * @param {String} domain
+ * @param {Object} firstPartiesList a second fqdn
+ *
+ * @return {Boolean} true if the domains are third party
+ */
+let firstPartyProtectionsEnabled = (function () {
+  let firstPartiesList;
+
+  function getFirstParties() {
+    let manifestJson = chrome.runtime.getManifest();
+    let firstParties = [];
+
+    for (let contentScriptObj of manifestJson.content_scripts) {
+      // only include parts from content scripts that have firstparties entries
+      if (contentScriptObj.js[0].includes("/firstparties/")) {
+        let extractedUrls = [];
+        for (let match of contentScriptObj.matches) {
+          extractedUrls.push(window.extractHostFromURL(match));
+        }
+        firstParties.push(extractedUrls);
+      }
+    }
+    return [].concat.apply([], firstParties);
+  }
+
+  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;
+      }
+    }
+    return false;
+  };
+})();
 
 /**
  * Checks whether a given URL is a special browser page.
@@ -469,6 +513,7 @@ let exports = {
   estimateMaxEntropy,
   explodeSubdomains,
   findCommonSubstrings,
+  firstPartyProtectionsEnabled,
   getHostFromDomainInput,
   isRestrictedUrl,
   isThirdPartyDomain,

src/js/webrequest.js

@@ -1020,7 +1020,8 @@ function dispatcher(request, sender, sendResponse) {
 
     let tab_host = window.extractHostFromURL(request.tabUrl),
       origins = badger.tabData[tab_id].origins,
-      cookieblocked = {};
+      cookieblocked = {},
+      isOnFirstParty = utils.firstPartyProtectionsEnabled(tab_host);
 
     for (let origin in origins) {
       // see if origin would be cookieblocked if not for user override
@@ -1034,10 +1035,12 @@ function dispatcher(request, sender, sendResponse) {
       criticalError: badger.criticalError,
       enabled: badger.isPrivacyBadgerEnabled(tab_host),
       errorText: badger.tabData[tab_id].errorText,
+      isOnFirstParty: isOnFirstParty,
       learnLocally: badger.getSettings().getItem("learnLocally"),
       noTabData: false,
       origins,
       seenComic: badger.getSettings().getItem("seenComic"),
+      showExpandedTrackingSection: badger.getSettings().getItem("showExpandedTrackingSection"),
       showLearningPrompt: badger.getPrivateSettings().getItem("showLearningPrompt"),
       showNonTrackingDomains: badger.getSettings().getItem("showNonTrackingDomains"),
       tabHost: tab_host,