Merge branch 'link-hint-text'

2 files changed, 23 insertions, 1 deletions

diff --git a/content_scripts/link_hints.coffee b/content_scripts/link_hints.coffee
index 2abfa001..f904c7d5 100644
--- a/content_scripts/link_hints.coffee
+++ b/content_scripts/link_hints.coffee
@@ -231,6 +231,8 @@ LinkHints =
     # Remove rects from elements where another clickable element lies above it.
     nonOverlappingElements = []
     # Traverse the DOM from first to last, since later elements show above earlier elements.
+    # NOTE(smblott). filterHints.generateLinkText also assumes this order when generating the content text for
+    # each hint.  Specifically, we consider descendents before we consider their ancestors.
     visibleElements = visibleElements.reverse()
     while visibleElement = visibleElements.pop()
       rects = [visibleElement.rect]
@@ -469,7 +471,7 @@ filterHints =
       linkText = element.firstElementChild.alt || element.firstElementChild.title
       showLinkText = true if (linkText)
     else
-      linkText = element.textContent || element.innerHTML
+      linkText = DomUtils.textContent.get element
 
     { text: linkText, show: showLinkText }
 
@@ -479,6 +481,7 @@ filterHints =
 
   fillInMarkers: (hintMarkers) ->
     @generateLabelMap()
+    DomUtils.textContent.reset()
     for marker, idx in hintMarkers
       marker.hintString = @generateHintString(idx)
       linkTextObject = @generateLinkText(marker.clickableItem)
diff --git a/lib/dom_utils.coffee b/lib/dom_utils.coffee
index 2ae9412e..f53e28d1 100644
--- a/lib/dom_utils.coffee
+++ b/lib/dom_utils.coffee
@@ -295,5 +295,24 @@ DomUtils =
       document.body.removeChild div
       coordinates
 
+  # Get the text content of an element (and its descendents), but omit the text content of previously-visited
+  # nodes.  See #1514.
+  # NOTE(smblott).  This is currently O(N^2) (when called on N elements).  An alternative would be to mark
+  # each node visited, and then clear the marks when we're done.
+  textContent: do ->
+    visitedNodes = null
+    reset: -> visitedNodes = []
+    get: (element) ->
+      nodes = document.createTreeWalker element, NodeFilter.SHOW_TEXT
+      texts =
+        while node = nodes.nextNode()
+          continue unless node.nodeType == 3
+          continue if node in visitedNodes
+          text = node.data.trim()
+          continue unless 0 < text.length
+          visitedNodes.push node
+          text
+      texts.join " "
+
 root = exports ? window
 root.DomUtils = DomUtils