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
+ * 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
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
@@ skipping 122 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)
+    if (subscriptions[this.url] && subscriptions[this.url].title)
+    {
+      this.title = subscriptions[this.url].title;
+    }
+    if (this.url == prefs.subscriptions_exceptionsurl_privacy)
     {
       this.title = "Allow only nonintrusive ads that are privacy-friendly";
     }
   }
   Subscription.prototype =
   {
     get disabled()
     {
       return this._disabled;
     },
@@ skipping 280 matching lines @@
     "###Werbung_Sky",
     "###Werbung_Wide",
     "###__ligatus_placeholder__",
     "###ad-bereich1-08",
     "###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 subscriptions = {
+    "https://easylist-downloads.adblockplus.org/easylistgermany+easylist.txt": {
+      title: "EasyList Germany+EasyList"
+    },
+    "https://easylist-downloads.adblockplus.org/exceptionrules.txt": {
+      title: "Allow non-intrusive advertising"
+    },
+    "https://easylist-downloads.adblockplus.org/fanboy-social.txt": {
+      title: "Fanboy's Social Blocking List",
+      type: "social"
+    },
+    "https://easylist-downloads.adblockplus.org/antiadblockfilters.txt": {
+      title: "Adblock Warning Removal List"
+    },
+    "~user~78625": {
+      title: "My filter list"
+    }
+  };
+
   let knownSubscriptions = Object.create(null);
-  for (let subscriptionUrl of subscriptions)
+  for (let subscriptionUrl in subscriptions)
   {
     knownSubscriptions[subscriptionUrl] =
       modules.subscriptionClasses.Subscription.fromURL(subscriptionUrl);
   }
   let customSubscription = knownSubscriptions["~user~786254"];
 
   if (params.addSubscription)
   {
     // We don't know how long it will take for the page to fully load
     // so we'll post the message after one second
@@ skipping 81 matching lines @@
       },
       filter: {
         text: "||example.com/some-annoying-popup$popup",
         whitelisted: false,
         userDefined: true,
         subscription: null
       }
     });
   });
 }());