Issue 3839 - Adapt for Prefs event changes

messageResponder.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2016 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 71 matching lines @@
   function onFilterChange(action)
   {
     var type;
     if (action == "load")
     {
       type = "filter";
       action = "loaded";
     }
     else
     {
-      var parts = action.split(".", 2);

[Sebastian Noack, 2016/03/22 14:24:10]

I just realized that the second argument is redundant as .split(".", 2) is just
a shorthand for .split(".").slice(0,2) in JavaScript.

+      var parts = action.split(".");
       type = parts[0];
       action = parts[1];
     }
 
     if (!(type in messageTypes))
       return;
 
     var args = [];
     for (var i = 1; i < arguments.length; i++)

[Sebastian Noack, 2016/03/22 07:29:56]

Note that passing arguments to other functions will cause this function from
beeing deoptimized in V8. So while cleaning up here, I fixed that as well.

     {
       var arg = arguments[i];
       if (arg instanceof Subscription)
         args.push(convertSubscription(arg));
       else if (arg instanceof Filter)
         args.push(convertFilter(arg));
       else
         args.push(arg);
     }
 
@@ skipping 162 matching lines @@
 
             if (!(filter.text in seenFilter))
               FilterStorage.removeFilter(filter);
           }
         }
         break;
       case "filters.listen":
         var listenerFilters = getListenerFilters(sender.page);
         if (message.filter)
         {
           FilterNotifier.addListener(onFilterChange);

[Sebastian Noack, 2016/03/22 07:29:56]

Since FilterNotifier.addListener() only adds the listener if it hasn't been
added before, we can just add onFilterChange when we need it, without bothering
whether we added it before.

           listenerFilters.filter = message.filter;
         }
         else
           delete listenerFilters.filter;
         break;
       case "filters.remove":
         var filter = Filter.fromText(message.text);
         var subscription = null;
         if (message.subscriptionUrl)
           subscription = Subscription.fromURL(message.subscriptionUrl);
@@ skipping 36 matching lines @@
         var subscription = Subscription.fromURL(message.url);
         if ("title" in message)
           subscription.title = message.title;
         if ("homepage" in message)
           subscription.homepage = message.homepage;
 
         if (message.confirm)
         {
           ext.showOptions(function()
           {
             sendMessage("app", "addSubscription", [convertSubscription(subscription)]);

[Sebastian Noack, 2016/03/22 07:29:56]

Sorry for the unrelated change, but it seems inappropriate to call
onFilterChange() here. Also if we don't the logic of onFilterChange() can be
simplified a little.

           });
         }
         else
         {
           subscription.disabled = false;
           FilterStorage.addSubscription(subscription);
 
           if (subscription instanceof DownloadableSubscription && !subscription.lastDownload)
             Synchronizer.execute(subscription);
         }
@@ skipping 58 matching lines @@
           if (subscription instanceof DownloadableSubscription)
             Synchronizer.execute(subscription, true);
         }
         break;
       case "subscriptions.isDownloading":
         callback(Synchronizer.isExecuting(message.url));
         break;
     }
   });
 })(this);