Issue 3829 - Merge add-subscriptions and subscriptions.add messages

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 279 matching lines @@
       case "prefs.get":
         callback(Prefs[message.key]);
         break;
       case "subscriptions.add":
         var subscription = Subscription.fromURL(message.url);
         if ("title" in message)
           subscription.title = message.title;
         if ("homepage" in message)
           subscription.homepage = message.homepage;
 
-        if (message.ask)

[Thomas Greiner, 2016/03/18 10:48:20]

Detail: Just a personal preference but what do you think about "confirm" instead
since our dialog is equivalent in its purpose to `window.confirm()`?

[Sebastian Noack, 2016/03/18 11:35:07]

Fine with me.

-        {
-          ext.showOptions(onFilterChange.bind(null, "addSubscription", subscription));

[Thomas Greiner, 2016/03/18 10:48:20]

Coding style: Mind the maximum line length.

[Sebastian Noack, 2016/03/18 11:35:07]

Done.

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