Issue 700 - Generate filters based on the style attribute as last resort

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 201 matching lines @@
   clickHide_mouseClick(ev);
 }
 
 // Hovering over an element so highlight it
 function clickHide_mouseOver(e)
 {
   if (clickHide_activated == false)
     return;
 
   var target = e.target;
-  while (target.parentNode && !(target.id || target.className || target.src))
+  while (target.parentNode && target.attributes.length == 0)
     target = target.parentNode;
   if (target == document.documentElement || target == document.body)
     target = null;
 
   if (target && target instanceof HTMLElement)
   {
     currentElement = target;
     currentElement_boxShadow = target.style.getPropertyValue("-webkit-box-shadow");
     currentElement_backgroundColor = target.style.backgroundColor;
     target.style.setProperty("-webkit-box-shadow", "inset 0px 0px 5px #d6d84b");
@@ skipping 54 matching lines @@
   // 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();
-  if (elementId)
+
+  var addSelector = function(selector)
   {
-    clickHideFilters.push(document.domain + "###" + elementId);
-    selectorList.push("#" + elementId);
-  }
-  if (elementClasses && elementClasses.length > 0)
-  {
-    var selector = elementClasses.map(function(elClass)
-    {
-      return "." + elClass.replace(/([^\w-])/, "\\$1");
-    }).join("");
-
     clickHideFilters.push(document.domain + "##" + selector);
     selectorList.push(selector);
+  };
+
+  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(relativeToAbsoluteUrl(url));
     selectorList.push(elt.localName + '[src="' + url + '"]');
   }
 
+  // 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 tag's name
+  // and all of its attributes, if everything else fails
+  if (clickHideFilters.length == 0)
+  {
+    var selector = elt.localName;
+
+    for (var i = 0; i < elt.attributes.length; i++)
+      selector += "[" + elt.attributes[i].name + '="' + elt.attributes[i].value.replace('"', '\\"') + '"]';
+
+    addSelector(selector);
+  }
+
   // 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
-  currentElement.style.setProperty("-webkit-box-shadow", currentElement_boxShadow);
-  currentElement.style.backgroundColor = currentElement_backgroundColor;
   // 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";
 
   // Make sure the browser doesn't handle this click
   e.preventDefault();
   e.stopPropagation();
 }
@@ skipping 224 matching lines @@
 
           clickHide_deactivate();
         }
         break;
       default:
         sendResponse({});
         break;
     }
   });
 }