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

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(/.*?:\/\//, '||'));
-    selectorList.push(elt.localName + '[src="' + elt.getAttribute("src") + '"]');
+    clickHideFilters.push(relativeToAbsoluteUrl(url));
+    selectorList.push(elt.localName + '[src="' + url + '"]');
   }
 
   // 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 16 matching lines @@
     // This OBJECT could contain an EMBED we already nuked, in which case there's no URL
     if(params[0])
       url = params[0].getAttribute("value");
     else {
       params = elt.querySelectorAll("param[name=\"src\"]");
       if(params[0])
         url = params[0].getAttribute("value");
     }
 
     if (url)
-      url = resolveURL(url);
+      url = normalizeURL(url);
   } else if(!url) {
     url = elt.src || elt.href;
   }
   return url;
 }
 
 // This function Copyright (c) 2008 Jeni Tennison, from jquery.uri.js
 // and licensed under the MIT license. See jquery-*.min.js for details.
 function removeDotSegments(u) {
   var r = '', m = [];
@@ skipping 15 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.
+// Does some degree of URL normalization
+function normalizeURL(url)
+{
+  var components = url.match(/(.+:\/\/.+?)\/(.*)/);
+  if(!components)
+    return url;
+  var newPath = removeDotSegments(components[2]);
+  if(newPath.length == 0)
+    return components[1];
+  if(newPath[0] != '/')
+    newPath = '/' + newPath;
+  return components[1] + newPath;
+}
+
 if (document instanceof HTMLDocument)

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

What about the comment above?

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

That comment is outdated. I have removed it. In fact we already changed that
check like that, in include.preload.js.

[Thomas Greiner, 2014/09/26 12:48:55]

Thanks. I'll ignore the rest of the changes in the second patch since they
belong to a different issue.

 {
   // 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 145 matching lines @@
         break;
       default:
         sendResponse({});
         break;
     }
   });
 
   if (window == window.top)
     ext.backgroundPage.sendMessage({type: "report-html-page"});
 }