Issue 3138 - Improve how context menu "block element" handles iframes

lib/filterComposer.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
- * Copyright (C) 2006-2017 eyeo GmbH
+ * Copyright (C) 2006-present 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/>.
  */
 
 /** @module filterComposer */
 
 "use strict";
 
 const {defaultMatcher} = require("matcher");
 const {RegExpFilter} = require("filterClasses");
 const {FilterNotifier} = require("filterNotifier");
 const {Prefs} = require("prefs");
 const {extractHostFromFrame, stringifyURL, isThirdParty} = require("url");
 const {getKey, checkWhitelisted} = require("whitelisting");
 const {port} = require("messaging");
+const info = require("info");
 
 let readyPages = new ext.PageMap();
 
 /**
  * Checks whether the given page is ready to use the filter composer
  *
  * @param {Page} page
  * @return {boolean}
  */
 exports.isPageReady = page =>
@@ skipping 72 matching lines @@
         getKey(page, frame), specificOnly
       );
 
       if (!filter)
       {
         let filterText = url.replace(/^[\w-]+:\/+(?:www\.)?/, "||");
 
         if (specificOnly)
           filterText += "$domain=" + docDomain;
 
-        if (filters.indexOf(filterText) == -1)
+        if (!filters.includes(filterText))
           filters.push(filterText);
       }
     }
 
     // If we couldn't generate any blocking filters, fallback to element hiding
     if (filters.length == 0 && !checkWhitelisted(page, frame,
                                                  RegExpFilter.typeMap.ELEMHIDE))
     {
       // Generate CSS selectors based on the element's "id" and
       // "class" attribute.
@@ skipping 27 matching lines @@
       // Add an element hiding filter for each generated CSS selector
       for (let selector of selectors)
         filters.push(docDomain.replace(/^www\./, "") + "##" + selector);
     }
   }
 
   return {filters, selectors};
 }
 
 let contextMenuItem = {
-  title: ext.i18n.getMessage("block_element"),
+  title: browser.i18n.getMessage("block_element"),
   contexts: ["image", "video", "audio"],
   onclick(page, info)
   {
     page.sendMessage(
       {type: "composer.content.contextMenuClicked"}, undefined, info.frameId
     );
   }
 };
 
 function updateContextMenu(page, filter)
 {
   page.contextMenus.remove(contextMenuItem);
 
   if (typeof filter == "undefined")
     filter = checkWhitelisted(page);
-  if (!filter && Prefs.shouldShowBlockElementMenu && readyPages.has(page))
+
+  // We don't support the filter composer on Firefox for Android, because the
+  // user experience on mobile is quite different.
+  if (info.application != "fennec" &&
+      !filter && Prefs.shouldShowBlockElementMenu && readyPages.has(page))
+  {
     page.contextMenus.create(contextMenuItem);
+  }
 }
 
 FilterNotifier.on("page.WhitelistingStateRevalidate", updateContextMenu);
 
 Prefs.on("shouldShowBlockElementMenu", () =>
 {
-  ext.pages.query({}, pages =>
-  {
-    for (let page of pages)
-      updateContextMenu(page);
+  browser.tabs.query({}, tabs =>
+  {
+    for (let tab of tabs)
+      updateContextMenu(new ext.Page(tab));
   });
+});
+
+port.on("composer.isPageReady", (message, sender) =>
+{
+  return readyPages.has(new ext.Page({id: message.pageId}));
 });
 
 port.on("composer.ready", (message, sender) =>
 {
   readyPages.set(sender.page, null);
   updateContextMenu(sender.page);
 });
 
 port.on("composer.openDialog", (message, sender) =>
 {
   return new Promise(resolve =>
   {
     ext.windows.create({
-      url: ext.getURL("composer.html"),
+      url: browser.extension.getURL("composer.html"),
       left: 50,
       top: 50,
       width: 420,
       height: 200,
       type: "popup"
     },
     popupPage =>
     {
       let popupPageId = popupPage.id;
       function onRemoved(removedPageId)
@@ skipping 31 matching lines @@
 
 port.on("composer.quoteCSS", (message, sender) =>
 {
   return quoteCSS(message.CSS);
 });
 
 ext.pages.onLoading.addListener(page =>
 {
   page.sendMessage({type: "composer.content.finished"});
 });