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 266 matching lines @@
   }
 
   return {filters: filters, exceptions: exceptions};
 }
 
 ext.onMessage.addListener(function (msg, sender, sendResponse)
 {
   switch (msg.type)
   {
     case "blockelement-open-popup":
-      var url = ext.getURL("block.html") + "?targetPageId=" + sender.page.id +
-                  "&filters=" + encodeURIComponent(JSON.stringify(msg.filters));
       ext.windows.create({
-        url: url,
+        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);
 
-        sender.page.sendMessage({
-          type: "blockelement-popup-opened",
-          popupId: popupPageId
-        });
+        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;
@@ skipping 27 matching lines @@
       {
         sendResponse(false);
         break;
       }
 
       var typeMask = RegExpFilter.typeMap[msg.mediatype];
       var documentHost = extractHostFromFrame(sender.frame);
       var sitekey = getKey(sender.page, sender.frame);
       var blocked = false;
 
+      var specificOnly = checkWhitelisted(
+        sender.page, sender.frame,
+        RegExpFilter.typeMap.GENERICBLOCK
+      );
+
       for (var i = 0; i < msg.urls.length; i++)
       {
         var url = new URL(msg.urls[i], msg.baseURL);
         var filter = defaultMatcher.matchesAny(
           stringifyURL(url), typeMask,
-          documentHost, isThirdParty(url, documentHost), sitekey
+          documentHost, isThirdParty(url, documentHost),
+          sitekey, specificOnly
         );
 
         if (filter instanceof BlockingFilter)
         {
           if (filter.collapse != null)
           {
             sendResponse(filter.collapse);
             return;
           }
 
@@ skipping 55 matching lines @@
       break;
     case "forward":
       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)
         {
           targetPage.sendMessage(msg.payload, sendResponse);
           return true;
         }
 
         targetPage.sendMessage(msg.payload);
       }
       break;
   }
 });
 
 // update icon when page changes location
 ext.pages.onLoading.addListener(function(page)
 {
   page.sendMessage({type: "blockelement-finished"});
   refreshIconAndContextMenu(page);
   showNextNotificationForUrl(page.url);
 });