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);
+
   var modules = {};
   global.require = function(module)
   {
     return modules[module];
   };
 
   modules.utils = {
     Utils: {
       getDocLink: function(link)
       {
@@ skipping 106 matching lines @@
   };
   modules.filterClasses.Filter.fromText = function(text)
   {
     return new modules.filterClasses.Filter(text);
   };
 
   modules.filterValidation = 
   {
     parseFilter: function(text) 
     {
-      var filterError = {filterError: false};
-      updateFromURL(filterError);

[Thomas Greiner, 2015/07/15 08:32:35]

Add this parameter to the README.

[saroyanm, 2015/07/15 10:47:08]

Done.

-      if (filterError)

[Sebastian Noack, 2015/07/15 09:00:44]

This will always be true. It should be |filterError.filterError|. Or to make it
less confusing, you might want to rename the variable to "params":

  var params = {filterError: false};
  updateFromURL(params);
  if (params.filterError)
    ...

[saroyanm, 2015/07/15 10:47:11]

Done.

-        return {error: "Filter-parsing-error-occurred"};

[Thomas Greiner, 2015/07/15 08:32:36]

I'd suggest to use all lower-case for consistency and to remove the "-occured"
at the end because it's an ID, not a statement.

[saroyanm, 2015/07/15 10:47:08]

Done.

+      
+      if (params.filterError)
+        return {error: "Invalid filter"};
       return {filter: modules.filterClasses.Filter.fromText(text)};
     },
     parseFilters: function(text)
     {
-      return {filters: text.split("\n").map(modules.filterClasses.Filter.fromText)};

[Thomas Greiner, 2015/07/15 08:32:35]

This line exceeds the 80 characters limit.

[Sebastian Noack, 2015/07/15 09:00:44]

You don't consider the filter filterError URL parameter here.

[saroyanm, 2015/07/15 10:47:09]

Done.

[saroyanm, 2015/07/15 10:47:11]

Done.

+      if (params.filterError)
+        return {errors: ["Invalid filter"]};
+      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 69 matching lines @@
     "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);