Handle disabled state of AA

js/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 219 matching lines @@
         displays[j].textContent = title;
     }
 
     element.setAttribute("aria-label", title);
     if (this.details[i].searchable)
       element.setAttribute("data-search", title.toLowerCase());
     let controls = element.querySelectorAll(".control[role='checkbox']");
     for (let control of controls)
     {
       control.setAttribute("aria-checked", item.disabled == false);
-      if (isAcceptableAds(item.url) && this == collections.filterLists)
-      {
-        element.classList.add("acceptable-ads");
+      if (isAcceptableAds(item.url) && this == collections.filterLists &&
+        !item.disabled)
+      {
+        control.disabled = true;
       }
     }
     if (additionalSubscriptions.includes(item.url))
     {
       element.classList.add("preconfigured");
       let disablePreconfigures =
         element.querySelectorAll("[data-disable~='preconfigured']");
       for (let disablePreconfigure of disablePreconfigures)
         disablePreconfigure.disabled = true;
     }
@@ skipping 819 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 && !acceptableAdsUrl.disabled)
+  if (acceptableAdsUrl in subscriptionsMap &&
+    !subscriptionsMap[acceptableAdsUrl].disabled)
   {
     acceptableAds.setAttribute("aria-checked", true);
     acceptableAdsPrivacy.setAttribute("aria-disabled", false);
   }
   else if (acceptableAdsPrivacyUrl in subscriptionsMap &&
-    !acceptableAdsPrivacyUrl.disabled)
+    !subscriptionsMap[acceptableAdsPrivacyUrl].disabled)
   {
     acceptableAds.setAttribute("aria-checked", true);
     acceptableAdsPrivacy.setAttribute("aria-checked", true);
     acceptableAdsPrivacy.setAttribute("aria-disabled", false);
 
     // Edge uses window instead of navigator.
     // Prefer navigator first since it's the standard.
     if ((navigator.doNotTrack || window.doNotTrack) != 1)
       acceptableAdsForm.classList.add("show-dnt-notification");
   }
@@ skipping 186 matching lines @@
         knownSubscription.originalTitle = subscription.title;
       else
         knownSubscription[property] = subscription[property];
     }
     subscription = knownSubscription;
   }
   switch (action)
   {
     case "disabled":
       updateSubscription(subscription);
+      if (isAcceptableAds(subscription.url))
+        setAcceptableAds();
+
       setPrivacyConflict();
       break;
     case "downloading":
     case "downloadStatus":
     case "homepage":
     case "lastDownload":
     case "title":
       updateSubscription(subscription);
       break;
     case "added":
@@ skipping 193 matching lines @@
            "ui_warn_tracking"]
 });
 port.postMessage({
   type: "subscriptions.listen",
   filter: ["added", "disabled", "homepage", "lastDownload", "removed",
            "title", "downloadStatus", "downloading"]
 });
 
 window.addEventListener("DOMContentLoaded", onDOMLoaded, false);
 window.addEventListener("hashchange", onHashChange, false);