Issue 5326 - General tab (HTML, strings and functionality)

background.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 84 matching lines @@
       }
     }
   };
 
   modules.prefs = {Prefs: new EventEmitter()};
   let prefs = {
     notifications_ignoredcategories: (params.showNotificationUI) ? ["*"] : [],
     notifications_showui: params.showNotificationUI,
     shouldShowBlockElementMenu: true,
     show_devtools_panel: true,
-    subscriptions_exceptionsurl: "https://easylist-downloads.adblockplus.org/exceptionrules.txt"
+    subscriptions_exceptionsurl: "https://easylist-downloads.adblockplus.org/exceptionrules.txt",
+    subscriptions_exceptionsurl_privacy: "https://easylist-downloads.adblockplus.org/exceptionrules-privacy.txt"
   };
   for (let key of Object.keys(prefs))
   {
     Object.defineProperty(modules.prefs.Prefs, key, {
       get()
       {
         return prefs[key];
       },
       set(value)
       {
@@ skipping 18 matching lines @@
     }
   };
 
   function Subscription(url)
   {
     this.url = url;
     this._disabled = false;
     this._lastDownload = 1234;
     this.homepage = "https://easylist.adblockplus.org/";
     this.downloadStatus = params.downloadStatus;
+
+    if (this.url == prefs.subscriptions_exceptionsurl)
+    {
+      this.title = "Allow non-intrusive advertising";
+    }
+    else if (this.url == prefs.subscriptions_exceptionsurl_privacy)
+    {
+      this.title = "Allow only nonintrusive ads that are privacy-friendly";
+    }
   }
   Subscription.prototype =
   {
     get disabled()
     {
       return this._disabled;
     },
     set disabled(value)
     {
       this._disabled = value;
@@ skipping 281 matching lines @@
     "###ad-bereich1-superbanner",
     "###ad-bereich2-08",
     "###ad-bereich2-skyscrapper"
   ];
   let knownFilters = filters.map(modules.filterClasses.Filter.fromText);
 
   let subscriptions = [
     "https://easylist-downloads.adblockplus.org/easylistgermany+easylist.txt",
     "https://easylist-downloads.adblockplus.org/exceptionrules.txt",
     "https://easylist-downloads.adblockplus.org/fanboy-social.txt",
+    "https://easylist-downloads.adblockplus.org/antiadblockfilters.txt",
     "~user~786254"
   ];
   let knownSubscriptions = Object.create(null);
   for (let subscriptionUrl of subscriptions)
   {
     knownSubscriptions[subscriptionUrl] =
       modules.subscriptionClasses.Subscription.fromURL(subscriptionUrl);
   }
   let customSubscription = knownSubscriptions["~user~786254"];
 
@@ skipping 85 matching lines @@
       },
       filter: {
         text: "||example.com/some-annoying-popup$popup",
         whitelisted: false,
         userDefined: true,
         subscription: null
       }
     });
   });
 }());