diff options
| author | mrmr1993 | 2015-09-13 15:10:30 +0100 |
|---|---|---|
| committer | mrmr1993 | 2015-09-13 15:10:30 +0100 |
| commit | 4a28bfb221b4fed51e6badea0c9d6598393794df (patch) | |
| tree | 1ab1a33f0be60116b07e595a134997ef07336af2 | |
| parent | 940ab8d62db784c2506222d3c5c6c1117b30fea3 (diff) | |
| download | vimium-4a28bfb221b4fed51e6badea0c9d6598393794df.tar.bz2 | |
Only show link hints for <label>s for elements without a hint
| -rw-r--r-- | content_scripts/link_hints.coffee | 2 | ||||
| -rw-r--r-- | tests/dom_tests/dom_tests.coffee | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/content_scripts/link_hints.coffee b/content_scripts/link_hints.coffee index dae7b14e..a5e94fd0 100644 --- a/content_scripts/link_hints.coffee +++ b/content_scripts/link_hints.coffee @@ -215,7 +215,7 @@ class LinkHintsMode when "button", "select" isClickable ||= not element.disabled when "label" - isClickable ||= element.control? + isClickable ||= element.control? and (@getVisibleClickable element.control).length == 0 # Elements with tabindex are sometimes useful, but usually not. We can treat them as second class # citizens when it improves UX, so take special note of them. diff --git a/tests/dom_tests/dom_tests.coffee b/tests/dom_tests/dom_tests.coffee index 80e39dfa..e814ec76 100644 --- a/tests/dom_tests/dom_tests.coffee +++ b/tests/dom_tests/dom_tests.coffee @@ -244,7 +244,7 @@ context "Filtered link hints", hintMarkers = getHintMarkers().map (marker) -> marker.textContent.toLowerCase() # We don't know the actual hint numbers which will be assigned, so we replace them with "N". hintMarkers = hintMarkers.map (str) -> str.replace /^[0-9]+/, "N" - assert.equal 7, hintMarkers.length + assert.equal 5, hintMarkers.length assert.isTrue "N" in hintMarkers assert.isTrue "N" in hintMarkers assert.isTrue "N: a label" in hintMarkers |