Issue 2426 - Open block.html as a popup window

blockElement.postload.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 367 matching lines @@
     return;
 
   let element = currentElement.prisoner || currentElement;
   getFiltersForElement(element, (filters, selectors) =>
   {
     if (currentlyPickingElement)
       stopPickingElement();
 
     ext.backgroundPage.sendMessage(
     {
-      type: "blockelement-open-popup",
-      filters: filters
+      type: "blockelement-open-popup"
+    },
+    response =>
+    {
+      blockelementPopupId = response;
+      ext.backgroundPage.sendMessage(
+      {
+        type: "forward",
+        targetPageId: blockelementPopupId,
+        payload:
+        {
+          type: "blockelement-popup-init",
+          filters: filters
+        }
+      });
     });
 
     if (selectors.length > 0)
       highlightElements(selectors.join(","));
 
     highlightElement(currentElement, "#fd1708", "#f6a1b5");
   });
 
   event.preventDefault();
   event.stopPropagation();
@@ skipping 124 matching lines @@
           // Apply added element hiding filters.
           updateStylesheet();
         }
         deactivateBlockElement();
         break;
       case "blockelement-clear-previous-right-click-event":
         if (!lastRightClickEventIsMostRecent)
           lastRightClickEvent = null;
         lastRightClickEventIsMostRecent = false;
         break;
-      case "blockelement-popup-opened":
-        if (window == window.top)
-          blockelementPopupId = msg.popupId;
-        break;
       case "blockelement-popup-closed":
         // The onRemoved hook for the popup can create a race condition, so we
         // to be careful here. (This is not perfect, but best we can do.)
         if (window == window.top && blockelementPopupId == msg.popupId)
         {
           ext.backgroundPage.sendMessage(
           {
             type: "forward",
             payload:
             {
               type: "blockelement-finished"
             }
           });
         }
         break;
     }
   });
-}
+
+  if (window == window.top)
+    ext.backgroundPage.sendMessage({type: "report-html-page"});
+}