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 128 matching lines @@
       }
     }
   };
 
   modules.filterClasses = {
     BlockingFilter: function() {},
     Filter: function(text)
     {
       this.text = text;
       this.disabled = false;
+    },
+    WhitelistFilter: function(text) 
+    {
+      modules.filterClasses.Filter.call(this, text);
     }
   };
   modules.filterClasses.Filter.fromText = function(text)
   {
+    if (text.indexOf("@@") == 0)
+      return new modules.filterClasses.WhitelistFilter(text);
     return new modules.filterClasses.Filter(text);
   };
 
+  modules.filterValidation = 
+  {
+    FilterParsingError: function(type, details)
+    {
+      this.type = type;
+      if (details)
+      {
+        if ("reason" in details)
+          this.reason = details.reason;
+        if ("selector" in details)
+          this.selector = details.selector;
+      }

[Thomas Greiner, 2015/07/13 15:54:21]

You're not using either `FilterParsingError.reason` or
`FilterParsingError.selector` so no need to add them. You need, however,
`FilterParsingError.toString()` which translates the error type into an error
message.

[saroyanm, 2015/07/14 10:20:58]

Done.

+    },
+    parseFilter: function(text) 
+    {
+      if (text)
+      {
+        if (text[0] == "[")
+          return {error: new modules.filterValidation.FilterParsingError("unexpected-filter-list-header")};
+      }
+      return {filter: modules.filterClasses.Filter.fromText(text)};
+    },
+    parseFilters: function(text)
+    {
+      var lines = text.split("\n");
+      var filters = [];
+      var errors = [];
+
+      for (var i = 0; i < lines.length; i++)
+      {
+        var parseResult = modules.filterValidation.parseFilter(lines[i]);
+        if (parseResult.error)
+          errors.push(parseResult.error);
+        else
+          filters.push(parseResult.filter);
+      }
+
+      return {filters: filters, errors: errors};
+    }
+  };
+
   modules.synchronizer = {
     Synchronizer: {}
   };
 
   modules.matcher = {
     defaultMatcher: {
       matchesAny: function(url, requestType, docDomain, thirdParty)
       {
         var params = {blockedURLs: ""};
         updateFromURL(params);
@@ skipping 48 matching lines @@
       {
         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);
@@ skipping 18 matching lines @@
         type: "message",
         payload: {
           title: "Custom subscription",
           url: "http://example.com/custom.txt",
           type: "add-subscription"
         }
       }, "*");
     }, 1000);
   }
 })(this);