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 20 matching lines @@
     }
   }
 
   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 108 matching lines @@
   {
     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 {error: "Invalid filter"};
       return {filter: modules.filterClasses.Filter.fromText(text)};
     },
     parseFilters: function(text)
     {
       if (params.filterError)
-        return {errors: ["filter-parsing-error"]};
+        return {errors: ["Invalid filter"]};
       return {filters: 
               text.split("\n").map(modules.filterClasses.Filter.fromText)};
     }
   };
 
   modules.synchronizer = {
     Synchronizer: {}
   };
 
   modules.matcher = {
@@ skipping 28 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 = {
@@ skipping 53 matching lines @@
         type: "message",
         payload: {
           title: "Custom subscription",
           url: "http://example.com/custom.txt",
           type: "add-subscription"
         }
       }, "*");
     }, 1000);
   }
 })(this);