Issue 2426 - Open block.html as a popup window

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 101 matching lines @@
 // See http://crbug.com/68705.
 var noStyleRulesHosts = ["mail.google.com", "mail.yahoo.com", "www.google.com"];
 
 var htmlPages = new ext.PageMap();
 
 var contextMenuItem = {
   title: ext.i18n.getMessage("block_element"),
   contexts: ["image", "video", "audio"],
   onclick: function(page)
   {
-    page.sendMessage({type: "clickhide-new-filter"});
+    page.sendMessage({type: "blockelement-context-menu-clicked"});
   }
 };
 
 // Adds or removes browser action icon according to options.
 function refreshIconAndContextMenu(page)
 {
   var whitelisted = !!checkWhitelisted(page);
   updateIcon(page, whitelisted);
 
   // show or hide the context menu entry dependent on whether
@@ skipping 143 matching lines @@
     }
   }
 
   return {filters: filters, exceptions: exceptions};
 }
 
 ext.onMessage.addListener(function (msg, sender, sendResponse)
 {
   switch (msg.type)
   {
+    case "blockelement-open-popup":
+      ext.windows.create({
+        url: ext.getURL("block.html"),
+        left: 50,
+        top: 50,
+        width: 420,
+        height: 200,
+        focused: true,
+        type: "popup"
+      },
+      function (popupPage) {
+        var popupPageId = popupPage.id;
+        function onRemoved(removedPageId)
+        {
+          if (popupPageId == removedPageId)
+          {
+            sender.page.sendMessage({
+              type: "blockelement-popup-closed",
+              popupId: popupPageId
+            });
+            ext.pages.onRemoved.removeListener(onRemoved);
+          }
+        }
+        ext.pages.onRemoved.addListener(onRemoved);
+
+        sendResponse(popupPageId);
+      });
+      return true;
+      break;
     case "get-selectors":
       var selectors = [];
       var trace = devtools && devtools.hasPanel(sender.page);
 
       if (!checkWhitelisted(sender.page, sender.frame,
                             RegExpFilter.typeMap.DOCUMENT |
                             RegExpFilter.typeMap.ELEMHIDE))
       {
         var noStyleRules = false;
         var specificOnly = checkWhitelisted(sender.page, sender.frame,
@@ skipping 105 matching lines @@
         frame: sender.frame
       }));
       break;
     case "trace-elemhide":
       devtools.logHiddenElements(
         sender.page, msg.selectors,
         extractHostFromFrame(sender.frame)
       );
       break;
     case "forward":
-      if (sender.page)
-      {
+      var targetPage;
+      if (msg.targetPageId)
+        targetPage = ext.getPage(msg.targetPageId);
+      else
+        targetPage = sender.page;
+
+      if (targetPage)
+      {
+        msg.payload.sender = sender.page.id;
         if (msg.expectsResponse)
         {
-          sender.page.sendMessage(msg.payload, sendResponse);
+          targetPage.sendMessage(msg.payload, sendResponse);
           return true;
         }
 
-        sender.page.sendMessage(msg.payload);
+        targetPage.sendMessage(msg.payload);
       }
       break;
   }
 });
 
 // update icon when page changes location
 ext.pages.onLoading.addListener(function(page)
 {
-  page.sendMessage({type: "clickhide-deactivate"});
+  page.sendMessage({type: "blockelement-finished"});
   refreshIconAndContextMenu(page);
   showNextNotificationForUrl(page.url);
 });