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 135 matching lines @@
     {
       this.text = text;
       this.disabled = false;
     }
   };
   modules.filterClasses.Filter.fromText = function(text)
   {
     return new modules.filterClasses.Filter(text);
   };
 
+  var validation = {filterError: false};

[Sebastian Noack, 2015/07/15 11:20:00]

I wonder whether it would make more sense meanwhile (to reduce code and number
of variables) to have only one object with all params? Thomas? 

  var params = {
    blockedURLs: "",
    seenDataCorruption: false,
    filterlistsReinitialized: false,
    addSubscription: false,
    filterError: false
  };
  updateFromURL(params);

[Thomas Greiner, 2015/07/15 11:31:40]

They're all globally accessible anyway and don't change after page load so I'm
in favor of this refactoring.

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

Done.

+  updateFromURL(validation);
+  modules.filterValidation = 
+  {
+    parseFilter: function(text) 
+    {
+      
+      if (validation.filterError)
+        return {error: "filter-parsing-error"};
+      return {filter: modules.filterClasses.Filter.fromText(text)};
+    },
+    parseFilters: function(text)
+    {
+      if (validation.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);
@@ 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);