Issue 2426 - Open block.html as a popup window

block.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
  * 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/>.
  */
 
-var searchParams = {};
+var targetPageId = null;
 
 function onKeyDown(event)
 {
   if (event.keyCode == 27)
   {
     event.preventDefault();
     closeDialog();
   }
   else if (event.keyCode == 13 && !event.shiftKey && !event.ctrlKey)
   {
@@ skipping 16 matching lines @@
     else
       alert(response.error);
   });
 }
 
 function closeDialog(success)
 {
   ext.backgroundPage.sendMessage(
   {
     type: "forward",
-    targetPageId: searchParams.targetPageId,
+    targetPageId: targetPageId,
     payload:
     {
       type: "blockelement-finished",
       remove: (typeof success == "boolean" ? success : false)
     }
   });
   window.close();
 }
 
 function init()
 {
-  // Parse the search parameters. We expect both the targetPageId and suggested
-  // filters to be provided.
-  window.location.search.substr(1).split("&").forEach(function(pair)
-  {
-    var parts = pair.split("=");
-    searchParams[parts[0]] = JSON.parse(decodeURIComponent(parts[1]));
-  });
-
   // Attach event listeners
   window.addEventListener("keydown", onKeyDown, false);
 
   document.getElementById("addButton").addEventListener("click", addFilters);
   document.getElementById("cancelButton").addEventListener(
     "click", closeDialog.bind(null, false)
   );
 
   // Apply jQuery UI styles
   $("button").button();
 
-  document.getElementById("filters").value = searchParams.filters.join("\n");
   document.getElementById("filters").focus();
 
   ext.onMessage.addListener(function(msg, sender, sendResponse)
   {
     switch (msg.type)
     {
+      case "blockelement-popup-init":
+        targetPageId = msg.sender;
+        document.getElementById("filters").value = msg.filters.join("\n");
+        break;
       case "blockelement-close-popup":
         window.close();
         break;
     }
   });
 
   window.removeEventListener("load", init);
 }
 window.addEventListener("load", init, false);