Hide sliders by default

src/_locales/en_US/messages.json

@@ -451,6 +451,14 @@
         "message": "There are no third party resources on this page. Hooray for privacy!",
         "description": "Text shown in the popup when showing non-tracking domains is enabled, and there are no third-party domains on the page."
     },
+    "popup_show_more": {
+        "message": "Show more",
+        "description": "Instructions to click to expand the blocked resources container on the popup"
+    },
+    "popup_show_less": {
+        "message": "Show less",
+        "description": "Instructions to click to collapse the blocked resources container on the popup"
+    },
     "intro_by_eff": {
         "message": "A project of the Electronic Frontier Foundation",
         "description": ""

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

@@ -189,6 +189,19 @@ function init() {
   $('#blockedResourcesContainer').on('change', 'input:radio', updateOrigin);
   $('#blockedResourcesContainer').on('click', '.userset .honeybadgerPowered', revertDomainControl);
 
+  $('#expand-blocked-resources-text').on('click', showBlockedResourcesHandler);
+  $('#collapse-blocked-resources-text').on('click', hideBlockedResourcesHandler);
+
+  if (POPUP_DATA.showExpandedTrackingSection) {
+    $('#expand-blocked-resources-text').hide();
+    $('#collapse-blocked-resources-text').show();
+    $('#blockedResources').show();
+  } else if (!POPUP_DATA.showExpandedTrackingSection) {
+    $('#expand-blocked-resources-text').show();
+    $('#collapse-blocked-resources-text').hide();
+    $('#blockedResources').hide();
+  }
+
   $("#version").text(
     chrome.i18n.getMessage("version", chrome.runtime.getManifest().version)
   );
@@ -452,6 +465,30 @@ function revertDomainControl(event) {
   });
 }
 
+/**
+ * Click handler for expanding the blocked resources section
+ */
+function showBlockedResourcesHandler() {
+  $("#collapse-blocked-resources-text").show();
+  $("#expand-blocked-resources-text").hide();
+  $("#blockedResources").show();
+  chrome.runtime.sendMessage({
+    type: "showTrackingDomainsSection"
+  });
+}
+
+/**
+ * Click handler for hiding the blocked resources section
+ */
+function hideBlockedResourcesHandler() {
+  $("#collapse-blocked-resources-text").hide();
+  $("#expand-blocked-resources-text").show();
+  $("#blockedResources").hide();
+  chrome.runtime.sendMessage({
+    type: "hideTrackingDomainsSection"
+  });
+}
+
 /**
  * Refresh the content of the popup window
  *
@@ -506,9 +543,10 @@ function refreshPopup() {
   }
 
   if (!originsArr.length) {
-    // hide the number of trackers and slider instructions message
+    // hide the number of trackers, slider instructions messages
     // if no sliders will be displayed
     $("#instructions-many-trackers").hide();
+    $("#toggleBlockedResourcesContainer").hide();
 
     // show "no trackers" message
     $("#instructions-no-trackers").show();

src/js/webrequest.js

@@ -1039,6 +1039,7 @@ function dispatcher(request, sender, sendResponse) {
       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,
@@ -1126,6 +1127,18 @@ function dispatcher(request, sender, sendResponse) {
     break;
   }
 
+  case "showTrackingDomainsSection": {
+    badger.getSettings().setItem("showExpandedTrackingSection", true);
+    sendResponse();
+    break;
+  }
+
+  case "hideTrackingDomainsSection": {
+    badger.getSettings().setItem("showExpandedTrackingSection", false);
+    sendResponse();
+    break;
+  }
+
   case "downloadCloud": {
     chrome.storage.sync.get("disabledSites", function (store) {
       if (chrome.runtime.lastError) {

src/skin/popup.css

@@ -173,6 +173,10 @@ font-size: 16px;
     min-height: 70px;
 }
 
+#toggleBlockedResourcesContainer {
+    text-align: center;
+}
+
 #intro-reminder-btn, #critical-error-link, #learning-prompt-btn {
     background-color: #ff641c;
     border: 2px solid #ff641c;

src/skin/popup.html

@@ -129,6 +129,10 @@ <h2 id="title-name"><span class="i18n_name"></span></h2>
       <span class="i18n_popup_instructions_no_trackers" data-i18n_contents_placeholders="<a target='_blank' title='i18n_what_is_a_tracker' class='tooltip' href='https://privacybadger.org/#What-is-a-third-party-tracker'>"></span>
       <span id="no-third-parties" class="i18n_popup_blocked" style="display:none"></span>
     </span>
+    <div id="toggleBlockedResourcesContainer">
+      <span id="expand-blocked-resources-text" class="i18n_popup_show_more"><span class="ui-icon ui-icon-caret-d"></span></span>
+      <span id="collapse-blocked-resources-text" class="i18n_popup_show_less" style="display:none"><span class="ui-icon ui-icon-caret-u"></span></span>
+    </div>
   </p>
   <div class="spacer"></div>
   <div id="blockedResources"></div>

tests/selenium/popup_test.py

@@ -230,6 +230,9 @@ def test_reverting_control(self):
 
         self.open_popup(origins={DOMAIN:"cookieblock"})
 
+        # make sure the 'see more' blocked resources container is expanded
+        self.driver.find_element_by_id("expand-blocked-resources-text").click()
+
         # set the domain to user control
         # click input with JavaScript to avoid "Element ... is not clickable" /
         # "Other element would receive the click" Selenium limitation