Issue 1428 - Disable "Block Element" on non-HTML pages

background.js

 /*
  * This file is part of Adblock Plus <http://adblockplus.org/>,
  * Copyright (C) 2006-2014 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 74 matching lines @@
   // update browser actions when whitelisting might have changed,
   // due to loading filters or saving filter changes
   if (action == "load" || action == "save")
     refreshIconAndContextMenuForAllPages();
 });
 
 // Special-case domains for which we cannot use style-based hiding rules.
 // See http://crbug.com/68705.
 var noStyleRulesHosts = ["mail.google.com", "mail.yahoo.com", "www.google.com"];
 
+var htmlPages = new ext.PageMap();
+
 function removeDeprecatedOptions()
 {
   var deprecatedOptions = ["specialCaseYouTube", "experimental", "disableInlineTextAds"];
   deprecatedOptions.forEach(function(option)
   {
     if (option in ext.storage)
       delete ext.storage[option];
   });
 }
 
@@ skipping 26 matching lines @@
   else
     iconFilename = "icons/abp-$size.png";
 
   page.browserAction.setIcon(iconFilename);
   iconAnimation.registerPage(page, iconFilename);
 
   // show or hide the context menu entry dependent on whether
   // adblocking is active on that page
   page.contextMenus.removeAll();
 
-  if (Prefs.shouldShowBlockElementMenu && !whitelisted && /^https?:/.test(page.url))

[Thomas Greiner, 2014/09/26 10:03:55]

Checking for HTML pages should be done in addition to and not instead of
checking for the protocol.

[Sebastian Noack, 2014/09/26 10:23:43]

What's the point? When our content script, setting up "Block Element"
functionally completed, it sends a message to the background page, which adds
that page to htmlPages. And this is everything we care about here, whether we
can use "Block Element" on that page.

+  if (Prefs.shouldShowBlockElementMenu && !whitelisted && htmlPages.has(page))
     page.contextMenus.create(contextMenuItem);
 }
 
 function refreshIconAndContextMenuForAllPages()
 {
   ext.pages.query({}, function(pages)
   {
     pages.forEach(refreshIconAndContextMenu);
   });
 }
@@ skipping 401 matching lines @@
       break;
     case "add-subscription":
       openOptions(function(page)
       {
         page.sendMessage(msg);
       });
       break;
     case "add-sitekey":
       processKey(msg.token, sender.page, sender.frame);
       break;
+    case "report-html-page":
+      htmlPages.set(sender.page, null);
+      refreshIconAndContextMenu(sender.page);
+      break;
     case "forward":
       if (sender.page)
       {
         sender.page.sendMessage(msg.payload, sendResponse);
         // Return true to indicate that we want to call
         // sendResponse asynchronously
         return true;
       }
       break;
     default:
       sendResponse({});
       break;
   }
 });
 
 // update icon when page changes location
 ext.pages.onLoading.addListener(function(page)
 {
   page.sendMessage({type: "clickhide-deactivate"});
   refreshIconAndContextMenu(page);
 });
 
 setTimeout(function()
 {
   var notificationToShow = Notification.getNextToShow();
   if (notificationToShow)
     showNotification(notificationToShow);
 }, 3 * 60 * 1000);