Issue 5632 - Use checkboxes for toggling acceptable ads

desktop-options.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-present eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * Adblock Plus is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 637 matching lines @@
           removeExisting: true
         },
         () =>
         {
           setCustomFiltersView("read");
         });
         break;
       case "show-more-filters-section":
         E("more-filters").setAttribute("aria-hidden", false);
         break;
-      case "switch-acceptable-ads": {
-        let isChecked = element.getAttribute("aria-checked") == "true";
+      case "switch-acceptable-ads":
         let value = element.value || element.dataset.value;
-        let isAcceptableAds = value == "ads";
+        // User check the checkbox
+        let shouldCheck = element.getAttribute("aria-checked") != "true";
+        let installAcceptableAds = false;
+        let installAcceptableAdsPrivacy = false;
+        // Acceptable Ads checkbox clicked
+        if (value == "ads")
+        {
+          installAcceptableAds = shouldCheck;
+        }
+        // Privacy Friendly Acceptable Ads checkbox clicked
+        else
+        {
+          installAcceptableAdsPrivacy = shouldCheck;
+          installAcceptableAds = !shouldCheck;
+        }
 
         browser.runtime.sendMessage({
-          type: isAcceptableAds != isChecked ? "subscriptions.add" :
+          type: installAcceptableAds ? "subscriptions.add" :
             "subscriptions.remove",
           url: acceptableAdsUrl
         });
         browser.runtime.sendMessage({
-          type: isAcceptableAds || isChecked ? "subscriptions.remove" :
-            "subscriptions.add",
+          type: installAcceptableAdsPrivacy ? "subscriptions.add" :
+            "subscriptions.remove",
           url: acceptableAdsPrivacyUrl
         });
         break;
-      }
       case "switch-tab":
         switchTab(element.getAttribute("href").substr(1));
         break;
       case "toggle-disable-subscription":
         browser.runtime.sendMessage({
           type: "subscriptions.toggle",
           keepInstalled: true,
           url: findParentData(element, "access", false)
         });
         break;
@@ skipping 360 matching lines @@
   }
 
   function setAcceptableAds()
   {
     let acceptableAdsForm = E("acceptable-ads");
     let acceptableAds = E("acceptable-ads-allow");
     let acceptableAdsPrivacy = E("acceptable-ads-privacy-allow");
     acceptableAdsForm.classList.remove("show-dnt-notification");
     acceptableAds.setAttribute("aria-checked", false);
     acceptableAdsPrivacy.setAttribute("aria-checked", false);
+    acceptableAdsPrivacy.setAttribute("tabindex", 0);
     if (acceptableAdsUrl in subscriptionsMap)
     {
       acceptableAds.setAttribute("aria-checked", true);
       acceptableAdsPrivacy.setAttribute("aria-disabled", false);
     }
     else if (acceptableAdsPrivacyUrl in subscriptionsMap)
     {
       acceptableAds.setAttribute("aria-checked", true);
       acceptableAdsPrivacy.setAttribute("aria-checked", true);
       acceptableAdsPrivacy.setAttribute("aria-disabled", false);
 
       if (navigator.doNotTrack != 1)
         acceptableAdsForm.classList.add("show-dnt-notification");
     }
     else
     {
       // Using aria-disabled in order to keep the focus
       acceptableAdsPrivacy.setAttribute("aria-disabled", true);

[ire, 2017/10/18 17:48:45]

This is a fine compromise. We should also set the tabindex to -1 when disabled,
to stop users being able to focus on it via keyboard when it is disabled. (I
tried this and it doesn't stop the element being focused when toggling it
specifically)

[saroyanm, 2017/10/19 20:41:56]

Good point, done.

+      acceptableAdsPrivacy.setAttribute("tabindex", -1);
     }
   }
 
   function isAcceptableAds(url)
   {
     return url == acceptableAdsUrl || url == acceptableAdsPrivacyUrl;
   }
 
   function populateLists()
   {
@@ skipping 320 matching lines @@
   });
   browser.runtime.sendMessage({
     type: "subscriptions.listen",
     filter: ["added", "disabled", "homepage", "lastDownload", "removed",
              "title", "downloadStatus", "downloading"]
   });
 
   window.addEventListener("DOMContentLoaded", onDOMLoaded, false);
   window.addEventListener("hashchange", onHashChange, false);
 }