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

background.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 319 matching lines @@
   {
     // 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",
-          ask: true,
-          type: "subscription.add"

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

The message type is "subscriptions.add".

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

Argh, right.

+          confirm: true,
+          type: "subscriptions.add"
         }
       }, "*");
     }, 1000);
   }
 
   ext.devtools.onCreated.addListener(function(panel)
   {
     // blocked request
     panel.sendMessage({
       type: "add-record",
@@ skipping 62 matching lines @@
       },
       filter: {
         text: "||example.com/some-annoying-popup$popup",
         whitelisted: false,
         userDefined: true,
         subscription: null
       }
     });
   });
 })(this);