Issue 6432 - Hide remove button for additional filter lists

background.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 50 matching lines @@
       for (let param of params)
       {
         let parts = param.split("=", 2);
         if (parts.length == 2 && parts[0] in data)
           data[parts[0]] = decodeURIComponent(parts[1]);
       }
     }
   }
 
   let params = {
-    additionalSubscriptions: false,

[Thomas Greiner, 2018/03/02 11:33:35]

Detail: Please also mention this new parameter in the README.

[Thomas Greiner, 2018/03/02 11:33:35]

Why not implement this the same way as "blockedURLs" and change the value to a
string that contains a list of URLs?

[saroyanm, 2018/03/02 13:50:29]

Done.

[saroyanm, 2018/03/02 13:50:29]

Done.

+    additionalSubscriptions: "",
     blockedURLs: "",
     filterlistsReinitialized: false,
     addSubscription: false,
     filterError: false,
     downloadStatus: "synchronize_ok",
     showNotificationUI: false,
     showPageOptions: false
   };
   updateFromURL(params);
 
+  const subscriptionServer = "https://easylist-downloads.adblockplus.org";
+  const easyListGermany = `${subscriptionServer}/easylistgermany+easylist.txt`;
+  const acceptableAds = `${subscriptionServer}/exceptionrules.txt`;
+  const acceptableAdsPrivacyFriendly =
+    `${subscriptionServer}/exceptionrules-privacy-friendly.txt`;
+  const redirectLink = "https://adblockplus.org/redirect?link=";
+
   let modules = {};
   window.require = function(module)
   {
     return modules[module];
   };
 
   modules.utils = {
     Utils: {
       getDocLink(link)
       {
-        return "https://adblockplus.org/redirect?link=" + encodeURIComponent(link);
+        return `${redirectLink}${encodeURIComponent(link)}`;
       },
       get appLocale()
       {
         return browser.i18n.getUILanguage();
       },
       get readingDirection()
       {
         return /^(?:ar|fa|he|ug|ur)\b/.test(this.appLocale) ? "rtl" : "ltr";
       }
     }
   };
 
   modules.prefs = {Prefs: new EventEmitter()};
   let prefs = {
-    notifications_ignoredcategories: (params.showNotificationUI) ? ["*"] : [],

[Thomas Greiner, 2018/03/02 17:00:02]

Detail: This change is unrelated to this issue and doesn't seem to add any
value.

+    notifications_ignoredcategories: params.showNotificationUI ? ["*"] : [],
     notifications_showui: params.showNotificationUI,
     shouldShowBlockElementMenu: true,
     show_devtools_panel: true,
     ui_warn_tracking: true,
-    additional_subscriptions: (params.additionalSubscriptions) ? ["https://easylist-downloads.adblockplus.org/easylistgermany+easylist.txt"] : [],

[kzar, 2018/03/02 09:57:01]

Nit: The paranthesis around params.additionalSubscriptions seem pointless.

Nit: This line is way too long, it passes linting since it contains a URL but
the purpose of that exception is to allow long URLs which would have to be split
up otherwise. How about having a few constants at the top of the file for these
URLS?

[Thomas Greiner, 2018/03/02 11:33:35]

Sounds like a personal preference which I usually leave up to the implementer.

[saroyanm, 2018/03/02 13:50:29]

Done.

[kzar, 2018/03/05 13:23:21]

Thanks

-    subscriptions_exceptionsurl: "https://easylist-downloads.adblockplus.org/exceptionrules.txt",
-    subscriptions_exceptionsurl_privacy: "https://easylist-downloads.adblockplus.org/exceptionrules-privacy-friendly.txt"
+    additional_subscriptions: params.additionalSubscriptions.split(","),
+    subscriptions_exceptionsurl: acceptableAds,
+    subscriptions_exceptionsurl_privacy: acceptableAdsPrivacyFriendly
   };
   for (let key of Object.keys(prefs))
   {
     Object.defineProperty(modules.prefs.Prefs, key, {
       get()
       {
         return prefs[key];
       },
       set(value)
       {
@@ skipping 21 matching lines @@
   modules.notificationHelper = {
     getActiveNotification()
     {
     },
     shouldDisplay()
     {
       return true;
     }
   };
 
-  let subscriptionServer = "https://easylist-downloads.adblockplus.org";
   let subscriptionDetails = {
-    [`${subscriptionServer}/easylistgermany+easylist.txt`]: {
+    [easyListGermany]: {
       title: "EasyList Germany+EasyList",
       installed: true
     },
-    [`${subscriptionServer}/exceptionrules.txt`]: {
+    [acceptableAds]: {
       title: "Allow non-intrusive advertising",
       installed: true
     },
-    [`${subscriptionServer}/exceptionrules-privacy-friendly.txt`]: {
+    [acceptableAdsPrivacyFriendly]: {
       title: "Allow only nonintrusive ads that are privacy-friendly"
     },
     [`${subscriptionServer}/fanboy-social.txt`]: {
       title: "Fanboy's Social Blocking List",
       installed: true
     },
     [`${subscriptionServer}/antiadblockfilters.txt`]: {
       title: "Adblock Warning Removal List",
       installed: true,
       disabled: true
@@ skipping 437 matching lines @@
       },
       filter: {
         text: "||example.com/some-annoying-popup$popup",
         whitelisted: false,
         userDefined: true,
         subscription: null
       }
     });
   });
 }());