Issue 705 - Generate element hiding instead request blocking filters for non-HTTP URLs

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 261 matching lines @@
   var elt = currentElement;
   var url = null;
   if (currentElement.className && currentElement.className == "__adblockplus__overlay")
   {
     elt = currentElement.prisoner;
     url = currentElement.prisonerURL;
   }
   else if (elt.src)
     url = elt.src;
 
-  // Only normalize when the element contains a URL (issue 328.)
-  // The URL is not always normalized, so do it here
-  if (url)
-    url = normalizeURL(relativeToAbsoluteUrl(url));
-
   // Construct filters. The popup will retrieve these.
   // Only one ID
   var elementId = elt.id ? elt.id.split(' ').join('') : null;
   // Can have multiple classes, and there might be extraneous whitespace
   var elementClasses = null;
   if (elt.className)
     elementClasses = elt.className.replace(/\s+/g, ' ').replace(/^\s+|\s+$/g, '').split(' ');
 
   clickHideFilters = new Array();
   selectorList = new Array();
 
   var addSelector = function(selector)
   {
     clickHideFilters.push(document.domain + "##" + selector);
     selectorList.push(selector);
   };
 
+  var addSelectorFromAttribute = function(element, attribute)
+  {
+    var value = element.getAttribute(attribute);
+    if (value)
+      addSelector(element.localName + "[" + attribute + '="' + value.replace(/"/g, '\\"') + '"]');
+  };
+
   if (elementId)
     addSelector("#" + elementId);
 
   if (elt.classList.length > 0)
   {
     var selector = "";
 
     for (var i = 0; i < elt.classList.length; i++)
       selector += "." + elt.classList[i].replace(/([^\w-])/, "\\$1");
 
     addSelector(selector);
   }
 
   if (url)
   {
-    clickHideFilters.push(url);
-    selectorList.push(elt.localName + '[src="' + url + '"]');
+    url = relativeToAbsoluteUrl(url);
+    if (/^https?:/.test(url))
+    {
+      clickHideFilters.push(normalizeURL(url));
+      selectorList.push(elt.localName + '[src="' + url + '"]');
+    }
+    else
+      addSelectorFromAttribute(elt, "src");
   }
 
   // restore the original style, before generating the fallback filter that
   // will include the style, and to prevent highlightElements from saving those
   currentElement.style.setProperty("-webkit-box-shadow", currentElement_boxShadow);
   currentElement.style.backgroundColor = currentElement_backgroundColor;
 
   // as last resort, create a filter based on inline styles
-  if (clickHideFilters.length == 0 && elt.hasAttribute("style"))
-    addSelector(elt.localName + '[style="' + elt.getAttribute("style") + '"]');
+  if (clickHideFilters.length == 0)
+    addSelectorFromAttribute(elt, "style");
 
   // Show popup
   clickHide_showDialog(e.clientX, e.clientY, clickHideFilters);
 
   // Highlight the elements specified by selector in yellow
   highlightElements(selectorList.join(","));
   // Now, actually highlight the element the user clicked on in red
   currentElement.style.setProperty("-webkit-box-shadow", "inset 0px 0px 5px #fd1708");
   currentElement.style.backgroundColor = "#f6a1b5";
 
@@ skipping 226 matching lines @@
 
           clickHide_deactivate();
         }
         break;
       default:
         sendResponse({});
         break;
     }
   });
 }