Issue 5374 - Add filter list popup

new-options.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2017 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 201 matching lines @@
       element.querySelector(".display").textContent = title;
       element.setAttribute("aria-label", title);
       if (this.details[i].searchable)
         element.setAttribute("data-search", title.toLowerCase());
       let control = element.querySelector(".control[role='checkbox']");
       if (control)
       {
         control.setAttribute("aria-checked", item.disabled == false);
         if (item.url == acceptableAdsUrl && this == collections.filterLists)
           control.disabled = true;
+
+        if (this.details[i].checkedDisabled)
+        {
+          control.disabled = item.disabled == false;
+          element.setAttribute("aria-disabled", true);
+        }
       }
 
+      let descriptionElem = element.querySelector(".description");
+      if (descriptionElem)
+        descriptionElem.textContent = item.description;
+
       let dateElement = element.querySelector(".date");
       let timeElement = element.querySelector(".time");
       if (dateElement && timeElement)
       {
         let message = element.querySelector(".message");
         if (item.isDownloading)
         {
           let text = getMessage("options_filterList_lastDownload_inProgress");
           message.textContent = text;
           element.classList.add("show-message");
@@ skipping 64 matching lines @@
     if (!nextElement)
       return false;
 
     nextElement.focus();
     return true;
   }
 
   collections.popular = new Collection([
     {
       id: "recommend-list-table"
+    },
+    {
+      id: "recommend-general-list-table",
+      checkedDisabled: true
     }
   ]);
   collections.langs = new Collection([
     {
       id: "blocking-languages-table",
       emptyText: ["options_dialog_language_added_empty"]
     },
     {
       id: "blocking-languages-dialog-table",
       emptyText: ["options_dialog_language_added_empty"]
     }
   ]);
   collections.allLangs = new Collection([
     {
       id: "all-lang-table",
       emptyText: ["options_dialog_language_other_empty"],
       searchable: true
+    },
+    {
+      id: "recommend-ads-list-table",
+      checkedDisabled: true
     }
   ]);
   collections.acceptableAds = new Collection([
     {
       id: "acceptableads-table"
     }
   ]);
   collections.custom = new Collection([
     {
       id: "custom-list-table"
@@ skipping 22 matching lines @@
   {
     if (subscription.recommended == "ads")
     {
       if (subscription.disabled)
       {
         collections.allLangs.addItem(subscription);
         collections.langs.removeItem(subscription);
       }
       else
       {
-        collections.allLangs.removeItem(subscription);
         collections.langs.addItem(subscription);
       }
     }
   }
 
   function addSubscription(subscription)
   {
     let collection;
     if (subscription.recommended)
     {
@@ skipping 57 matching lines @@
             homepage: null,
             originalTitle: element.getAttribute("title"),
             recommended: type,
             url: element.getAttribute("url")
           };
 
           let prefix = element.getAttribute("prefixes");
           if (prefix)
           {
             prefix = prefix.replace(/\W/g, "_");
-            subscription.title = getMessage("options_language_" + prefix);
+            subscription.title = element.getAttribute("specialization");
+            subscription.description = getMessage("options_language_" + prefix);

[saroyanm, 2017/07/07 18:22:11]

The strings will need to be updated after the specification update, see ->
https://bitbucket.org/adblockplus/spec/issues/44

[saroyanm, 2017/07/13 17:09:22]

Updated the reference -> https://bitbucket.org/adblockplus/spec/issues/47

           }
           else
           {
             type = type.replace(/\W/g, "_");
-            subscription.title = getMessage("common_feature_" +
+            subscription.title = getMessage("options_feature_" +
                                             type + "_title");
+            subscription.description = getMessage("options_feature_" +

[saroyanm, 2017/07/07 18:22:11]

I don't think that TYPE is a unique identifier for the recommended
subscriptions, we shouldn't use type for the string assignment.
I think we should introduce a new attribute ? Maybe 'referenceId' ?

[saroyanm, 2017/07/13 17:09:22]

As discussed we can still use type, while we are planing to introduce 1 type per
recommendation. which makes unique "for now?".

+                                            type + "_description");
           }
 
           addSubscription(subscription);
         }
       });
   }
 
   function findParentData(element, dataName, returnElement)
   {
     while (element)
@@ skipping 37 matching lines @@
     location.hash = id;
   }
 
   function execAction(action, element)
   {
     switch (action)
     {
       case "add-domain-exception":
         addWhitelistedDomain();
         break;
-      case "add-language-subscription":
+      case "add-enable-subscription":
         addEnableSubscription(findParentData(element, "access", false));
         break;
       case "add-predefined-subscription": {
         let dialog = E("dialog-content-predefined");
         let title = dialog.querySelector("h3").textContent;
         let url = dialog.querySelector(".url").textContent;
         addEnableSubscription(url, title);
         closeDialog();
         break;
       }
@@ skipping 796 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);
 }