Issue 1868 - Handle <area> element properly when selected with "Block element"

include.postload.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2015 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 316 matching lines @@
 
 // Turn on the choose element to create filter thing
 function clickHide_activate() {
   if(document == null)
     return;
 
   // If we are already selecting, abort now
   if (clickHide_activated || clickHideFiltersDialog)
     clickHide_deactivate();
 
-  // Add overlays for blockable elements that don't emit mouse events that they can still be selected

[kzar, 2015/02/09 17:24:41]

Nitpick: Should read "...so that they can still be selected"

[Sebastian Noack, 2015/02/10 10:19:27]

Done.

+  // Add overlays for blockable elements that don't emit mouse events,
+  // so that they can still be selected.
   var elts = document.querySelectorAll('object,embed,iframe,frame');
   for(var i=0; i<elts.length; i++)
   {
     var element = elts[i];
     if (isBlockable(element))
       addElementOverlay(element);
   }
 
   clickHide_activated = true;
   document.addEventListener("mouseover", clickHide_mouseOver, true);
@@ skipping 66 matching lines @@
     if (element instanceof HTMLElement && element.localName != "area")
     {
       // Handle <area> and their <map> elements specially,
       // blocking the image they are associated with
       if (element.localName == "map")
       {
         var images = document.querySelectorAll("img[usemap]");
         for (var i = 0; i < images.length; i++)
         {
           var image = images[i];
           var usemap = image.getAttribute("usemap");

[kzar, 2015/02/09 17:24:41]

Don't we need to check that usemap isn't null before we try to use its indexOf
and substr methods?

[Sebastian Noack, 2015/02/10 10:19:27]

Mind the CSS selector above, excluding elements without "usemap" attribute.

[kzar, 2015/02/10 11:03:01]

Ah OK

           var index = usemap.indexOf("#");
 
           if (index != -1 && usemap.substr(index + 1) == element.name)
             return getBlockableElementOrAncestor(image);
         }
 
         return null;
       }
 
       if (isBlockable(element))
         return element;
     }
 
     element = element.parentElement;
   }
 
   return null;
 }
-
 
 // Hovering over an element so highlight it
 function clickHide_mouseOver(e)
 {
   if (clickHide_activated == false)
     return;
 
   var target = getBlockableElementOrAncestor(e.target);
 
   if (target)
@@ skipping 301 matching lines @@
           lastRightClickEventValid = false;
         else
           lastRightClickEvent = null;
         break;
     }
   });
 
   if (window == window.top)
     ext.backgroundPage.sendMessage({type: "report-html-page"});
 }