Merge remote branch 'origin/master' into filter-hints

1 files changed, 3 insertions, 3 deletions

diff --git a/linkHints.js b/linkHints.js
index 8aed5fff..1367a827 100644
--- a/linkHints.js
+++ b/linkHints.js
@@ -30,11 +30,11 @@ var linkHintsPrototype = {
    * The final expression will be something like "//button | //xhtml:button | ..."
    */
   clickableElementsXPath: (function() {
-    var clickableElements = ["a", "textarea", "button", "select", "input[not(@type='hidden')]"];
+    var clickableElements = ["a", "textarea", "button", "select", "input[not(@type='hidden')]",
+                             "*[@onclick or @tabindex or @role='link' or @role='button']"];
     var xpath = [];
     for (var i in clickableElements)
       xpath.push("//" + clickableElements[i], "//xhtml:" + clickableElements[i]);
-    xpath.push("//*[@onclick]");
     return xpath.join(" | ")
   })(),
 
@@ -90,7 +90,7 @@ var linkHintsPrototype = {
     this.hintMarkerContainingDiv.className = "internalVimiumHintMarker";
     for (var i = 0; i < this.hintMarkers.length; i++)
       this.hintMarkerContainingDiv.appendChild(this.hintMarkers[i]);
-    document.body.appendChild(this.hintMarkerContainingDiv);
+    document.documentElement.appendChild(this.hintMarkerContainingDiv);
   },
 
   hintStringGenerator: function() {},