Issue 2376 - Implement custom filters in new options page

background.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2015 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 13 matching lines @@
       var params = window.location.search.substr(1).split("&");
       for (var i = 0; i < params.length; i++)
       {
         var parts = params[i].split("=", 2);
         if (parts.length == 2 && parts[0] in data)
           data[parts[0]] = decodeURIComponent(parts[1]);
       }
     }
   }
 
+  var params = {
+    blockedURLs: "",
+    seenDataCorruption: false,
+    filterlistsReinitialized: false,
+    addSubscription: false,
+    filterError: false
+  };  
+  updateFromURL(params);

[Sebastian Noack, 2015/07/15 14:30:08]

Nit: There should be an empty line below.

[saroyanm, 2015/07/15 14:36:05]

Done.

   var modules = {};
   global.require = function(module)
   {
     return modules[module];
   };
 
   modules.utils = {
     Utils: {
       getDocLink: function(link)
       {
@@ skipping 102 matching lines @@
     {
       this.text = text;
       this.disabled = false;
     }
   };
   modules.filterClasses.Filter.fromText = function(text)
   {
     return new modules.filterClasses.Filter(text);
   };
 
+  modules.filterValidation = 
+  {
+    parseFilter: function(text) 
+    {
+      
+      if (params.filterError)
+        return {error: "filter-parsing-error"};

[Sebastian Noack, 2015/07/15 14:30:08]

Nit: This is human readable text. So no need for dashes. How about "Invalid
filter"?

[saroyanm, 2015/07/15 14:36:05]

Done.

+      return {filter: modules.filterClasses.Filter.fromText(text)};
+    },
+    parseFilters: function(text)
+    {
+      if (params.filterError)
+        return {errors: ["filter-parsing-error"]};
+      return {filters: 
+              text.split("\n").map(modules.filterClasses.Filter.fromText)};
+    }
+  };
+
   modules.synchronizer = {
     Synchronizer: {}
   };
 
   modules.matcher = {
     defaultMatcher: {
       matchesAny: function(url, requestType, docDomain, thirdParty)
       {
-        var params = {blockedURLs: ""};
-        updateFromURL(params);
         var blocked = params.blockedURLs.split(",");
         if (blocked.indexOf(url) >= 0)
           return new modules.filterClasses.BlockingFilter();
         else
           return null;
       }
     }
   };
 
   var notifierListeners = [];
@@ skipping 15 matching lines @@
       triggerListeners: function()
       {
         var args = Array.prototype.slice.apply(arguments);
         var listeners = notifierListeners.slice();
         for (var i = 0; i < listeners.length; i++)
           listeners[i].apply(null, args);
       }
     }
   };
 
   modules.info = {

[saroyanm, 2015/07/15 12:06:53]

I can't find if we are using it somewhere. 
Do we need this here Thomas ?

[Thomas Greiner, 2015/07/15 12:29:35]

Yes, this is being used for the first-run page. You can find more information
about it in the README.

[saroyanm, 2015/07/15 12:34:58]

Got it.

     platform: "gecko",
     platformVersion: "34.0",
     application: "firefox",
     applicationVersion: "34.0",
     addonName: "adblockplus",
     addonVersion: "2.6.7"
   };
   updateFromURL(modules.info);
 
   global.Services = {
     vc: {
       compare: function(v1, v2)
       {
         return parseFloat(v1) - parseFloat(v2);
       }
     }
   };
 
   var filters = [
     "@@||alternate.de^$document",
     "@@||der.postillion.com^$document", 
     "@@||taz.de^$document",
-    "@@||amazon.de^$document"
+    "@@||amazon.de^$document",
+    "||biglemon.am/bg_poster/banner.jpg",
+    "winfuture.de###header_logo_link",
+    "###WerbungObenRechts10_GesamtDIV",
+    "###WerbungObenRechts8_GesamtDIV",
+    "###WerbungObenRechts9_GesamtDIV",
+    "###WerbungUntenLinks4_GesamtDIV",
+    "###WerbungUntenLinks7_GesamtDIV",
+    "###WerbungUntenLinks8_GesamtDIV",
+    "###WerbungUntenLinks9_GesamtDIV",
+    "###Werbung_Sky",
+    "###Werbung_Wide",
+    "###__ligatus_placeholder__",
+    "###ad-bereich1-08",
+    "###ad-bereich1-superbanner",
+    "###ad-bereich2-08",
+    "###ad-bereich2-skyscrapper"
   ];
   var knownFilters = filters.map(modules.filterClasses.Filter.fromText);
 
   var subscriptions = [
     "https://easylist-downloads.adblockplus.org/easylistgermany+easylist.txt",
     "https://easylist-downloads.adblockplus.org/exceptionrules.txt",
     "https://easylist-downloads.adblockplus.org/fanboy-social.txt",
     "~user~786254"
   ];
   var knownSubscriptions = Object.create(null);
   for (var subscriptionUrl of subscriptions)
     knownSubscriptions[subscriptionUrl] = modules.subscriptionClasses.Subscription.fromURL(subscriptionUrl);
   var customSubscription = knownSubscriptions["~user~786254"];
 
-  var issues = {seenDataCorruption: false, filterlistsReinitialized: false};
-  updateFromURL(issues);
-  global.seenDataCorruption = issues.seenDataCorruption;
-  global.filterlistsReinitialized = issues.filterlistsReinitialized;
+  global.seenDataCorruption = params.seenDataCorruption;
+  global.filterlistsReinitialized = params.filterlistsReinitialized;
   
-  var events = {addSubscription: false};
-  updateFromURL(events);
-  if (events.addSubscription)
+  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
     setTimeout(function()
     {
       window.postMessage({
         type: "message",
         payload: {
           title: "Custom subscription",
           url: "http://example.com/custom.txt",
           type: "add-subscription"
         }
       }, "*");
     }, 1000);
   }
 })(this);