Issue 704 - Generate protocol-agnostic request blocking filters with "Block element"

include.postload.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 373 matching lines @@
     var selector = elementClasses.map(function(elClass)
     {
       return "." + elClass.replace(/([^\w-])/, "\\$1");
     }).join("");
 
     clickHideFilters.push(document.domain + "##" + selector);
     selectorList.push(selector);
   }
   if (url)
   {
-    clickHideFilters.push(url.replace(/.*?:\/\//, '||'));

[Thomas Greiner, 2014/09/30 11:10:53]

Nit: Use double instead of single quotation marks for strings.

[Wladimir Palant, 2014/10/01 18:00:45]

It makes sense to use the same regular expression here as in composer.js in
Firefox (which in turn is based on the regular expression actually used by
RegExpFilter):

  /^[\w\-]+:\/+(?:www\.)?/

[Sebastian Noack, 2014/10/01 18:10:55]

Done.

[Sebastian Noack, 2014/10/01 18:10:55]

Done.

-    selectorList.push(elt.localName + '[src="' + elt.getAttribute("src") + '"]');

[Wladimir Palant, 2014/10/01 18:00:45]

Please remove this line, your previous patch did this.

[Sebastian Noack, 2014/10/01 18:10:55]

How do you mean? I didn't add this line, I just fixed it, to use the actual
"src" attribute instead the normalized URL, which won't match.

[Wladimir Palant, 2014/10/01 18:26:51]

As mentioned before, a hiding filter based on the src attribute makes exactly
zero sense - we shouldn't suggest it. And, yes - I know that you didn't
introduce that code.

[Sebastian Noack, 2014/10/01 18:33:16]

We don't generate a filer here. This list is only used to highlight matching
elements, while the "Block Element" shows.

+    clickHideFilters.push(url.replace(/^[\w\-]+:\/+(?:www\.)?/, "||"));
+    selectorList.push('[src="' + elt.getAttribute("src") + '"]');
   }
 
   // Show popup
   clickHide_showDialog(e.clientX, e.clientY, clickHideFilters);
 
   // Highlight the unlucky elements
   // Restore currentElement's box-shadow and bgcolor so that highlightElements won't save those
   unhighlightElement(currentElement);
   // Highlight the elements specified by selector in yellow
   highlightElements(selectorList.join(","));
@@ skipping 52 matching lines @@
         u = m[2];
         r = r + m[1];
       }
     }
     return r;
   } else {
     return u;
   }
 }
 
-// Content scripts are apparently invoked on non-HTML documents, so we have to
-// check for that before doing stuff. |document instanceof HTMLDocument| check
-// will fail on some sites like planet.mozilla.org because WebKit creates
-// Document instances for XHTML documents, have to test the root element.
-if (document.documentElement instanceof HTMLElement)
+if (document instanceof HTMLDocument)
 {
   // Use a contextmenu handler to save the last element the user right-clicked on.
   // To make things easier, we actually save the DOM event.
   // We have to do this because the contextMenu API only provides a URL, not the actual
   // DOM element.
   document.addEventListener('contextmenu', function(e) {
     lastRightClickEvent = e;
   }, false);
 
   document.addEventListener("click", function(event)
@@ skipping 141 matching lines @@
             currentElement.parentNode.removeChild(currentElement);
 
           clickHide_deactivate();
         }
         break;
       default:
         sendResponse({});
         break;
     }
   });
-}
+
+  if (window == window.top)
+    ext.backgroundPage.sendMessage({type: "report-html-page"});
+}