Issue 1663 - Emulate background page and implement proper message responder

background.js

 /*
  * This file is part of Adblock Plus <http://adblockplus.org/>,
  * Copyright (C) 2006-2014 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
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with Adblock Plus.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 (function(global)
 {
-  function getURLParameters(data)

[Thomas Greiner, 2014/12/18 17:32:06]

The function name is not reflecting what it does (same as noted here
http://codereview.adblockplus.org/6180766664884224/diff/5741031244955648/ext/...)

[Wladimir Palant, 2014/12/18 22:04:44]

Fixed by rebasing.

+  function updateFromURL(data)
   {
     if (window.location.search)
     {
       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 subscriptions =[
     "https://easylist-downloads.adblockplus.org/easylistgermany+easylist.txt",
     "https://easylist-downloads.adblockplus.org/exceptionrules.txt",
     "https://easylist-downloads.adblockplus.org/fanboy-social.txt"
   ];
 
   global.Utils = {
     getDocLink: function(link)
     {
       return "https://adblockplus.org/redirect?link=" + encodeURIComponent(link);
     }
   };
 
-  global.Subscription = {
-    fromURL: function(url)
-    {
-      return {
-        url: url,
-        title: "Subscription " + url,
-        disabled: false,
-        lastDownload: 1234
-      };
-    }
+  global.Subscription = function(url)
+  {
+    this.url = url;
+    this.title = "Subscription " + url;
+    this.disabled = false;
+    this.lastDownload = 1234;
   };
+
+  global.Subscription.fromURL = function(url)
+  {
+    return new global.Subscription(url);
+  };
+
+  global.DownloadableSubscription = global.Subscription;
+  global.SpecialSubscription = function() {};
 
   global.FilterStorage = {
     get subscriptions()
     {
       return subscriptions.map(global.Subscription.fromURL);
     },
 
     get knownSubscriptions()
     {
       var result = {};
@@ skipping 22 matching lines @@
       }
     }
   };
 
   global.BlockingFilter = function() {};
 
   global.defaultMatcher = {
     matchesAny: function(url, requestType, docDomain, thirdParty)
     {
       var params = {blockedURLs: ""};
-      getURLParameters(params);
+      updateFromURL(params);
       var blocked = params.blockedURLs.split(",");
       if (blocked.indexOf(url) >= 0)
         return new global.BlockingFilter();
       else
         return null;
     }
   };
 
   var notifierListeners = [];
   global.FilterNotifier = {
@@ skipping 16 matching lines @@
       var listeners = notifierListeners.slice();
       for (var i = 0; i < listeners.length; i++)
         listeners[i].apply(null, args);
     }
   };
 
   global.require = function(module)
   {
     if (module == "info")
     {
-      var result = {platform: "gecko", platformVersion: "34.0", application: "firefox", applicationVersion: "34.0"};

[Thomas Greiner, 2014/12/18 17:32:06]

Again a line that doesn't need to be that long.

[Wladimir Palant, 2014/12/18 22:04:44]

Done.

-      getURLParameters(result);
+      var result = {
+        platform: "gecko",
+        platformVersion: "34.0",
+        application: "firefox",
+        applicationVersion: "34.0"
+      };
+      updateFromURL(result);
       return result;
     }
     else
       return undefined;
   }
 
   global.openOptions = function()
   {
     window.open("http://example.com/options.html", "_blank");
   };
 
+  global.Services = {
+    vc: {
+      compare: function(v1, v2)
+      {
+        return parseFloat(v1) - parseFloat(v2);
+      }
+    }
+  };
+
   var issues = {seenDataCorruption: false, filterlistsReinitialized: false};
-  getURLParameters(issues);
+  updateFromURL(issues);
   global.seenDataCorruption = issues.seenDataCorruption;
   global.filterlistsReinitialized = issues.filterlistsReinitialized;
 })(this);