Issue 5631 - do not show disabled filters in more section

new-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 334 matching lines @@
       id: "blocking-languages-table",
       emptyText: ["options_language_empty"]
     }
   ]);
   collections.allLangs = new Collection([
     {
       id: "all-lang-table-add",
       emptyText: ["options_dialog_language_other_empty"]
     }
   ]);
-  collections.custom = new Collection([
+  collections.more = new Collection([

[saroyanm, 2017/09/15 16:38:00]

I changed name from custom to more, as custom was ambiguous name and could have
been mixed with user's "customFilters".
Please let me know if you have a better suggestion, I used more to reflect the
section name in specs.

[Thomas Greiner, 2017/09/15 17:06:05]

Acknowledged.

     {
-      id: "custom-list-table"
+      id: "more-list-table"
     }
   ]);
   collections.whitelist = new Collection([
     {
       id: "whitelisting-table",
       emptyText: ["options_whitelist_empty_1", "options_whitelist_empty_2"]
     }
   ]);
   collections.filterLists = new Collection([
     {
       id: "all-filter-lists-table",
       useOriginalTitle: true
     }
   ]);
 
   function addSubscription(subscription)
   {
+    let disabled = subscription.disabled;
     let collection = null;
     if (subscription.recommended)
     {
       if (subscription.recommended == "ads")
       {
-        if (subscription.disabled == false)
+        if (disabled == false)
           collection = collections.langs;
 
         collections.allLangs.addItem(subscription);
       }
       else
       {
         collection = collections.protection;
       }
     }
-    else if (!isAcceptableAds(subscription.url))
+    else if (!isAcceptableAds(subscription.url) && disabled == false)
     {
-      collection = collections.custom;
+      collection = collections.more;
     }
 
     if (collection)
       collection.addItem(subscription);
 
     subscriptionsMap[subscription.url] = subscription;
     updateTooltips();
   }
 
   function updateSubscription(subscription)
   {
     for (let name in collections)
       collections[name].updateItem(subscription);
 
     if (subscription.recommended == "ads")
     {
       if (subscription.disabled)
         collections.langs.removeItem(subscription);
       else
         collections.langs.addItem(subscription);
     }
     else if (!subscription.recommended && !isAcceptableAds(subscription.url))
     {
       if (subscription.disabled == false)
       {
-        collections.custom.addItem(subscription);
+        collections.more.addItem(subscription);
         updateTooltips();
       }
       else
       {
-        collections.custom.removeItem(subscription);
+        collections.more.removeItem(subscription);
       }
     }
   }
 
   function updateFilter(filter)
   {
     let match = filter.text.match(whitelistedDomainRegexp);
     if (match && !filtersMap[filter.text])
     {
       filter.title = match[1];
@@ skipping 755 matching lines @@
         }
         else
         {
           delete subscriptionsMap[subscription.url];
           if (isAcceptableAds(subscription.url))
           {
             setAcceptableAds();
           }
           else
           {
-            collections.custom.removeItem(subscription);
+            collections.more.removeItem(subscription);
           }
         }
         collections.filterLists.removeItem(subscription);
         break;
     }
 
   }
 
   function hidePref(key, value)
   {
@@ skipping 122 matching lines @@
   });
   ext.backgroundPage.sendMessage({
     type: "subscriptions.listen",
     filter: ["added", "disabled", "homepage", "lastDownload", "removed",
              "title", "downloadStatus", "downloading"]
   });
 
   window.addEventListener("DOMContentLoaded", onDOMLoaded, false);
   window.addEventListener("hashchange", onHashChange, false);
 }