diff options
| author | Phil Crosby | 2014-04-18 23:00:28 -0700 |
|---|---|---|
| committer | Phil Crosby | 2014-04-18 23:00:28 -0700 |
| commit | 5ebc1aa78ba595e3753e00c3d912d9e45e310e7f (patch) | |
| tree | 745db32693b9a2a8122c727be385b0d44e04c676 | |
| parent | 366c0a56a4eed38fa8425fd227cd389181fbed92 (diff) | |
| parent | 004f9a119d15d1b7e96ba50c1fec2c56b052a5b8 (diff) | |
| download | vimium-5ebc1aa78ba595e3753e00c3d912d9e45e310e7f.tar.bz2 | |
Merge pull request #945 from shyiko/master
Fixed detection of links which are only partially inside the viewport
| -rw-r--r-- | lib/dom_utils.coffee | 16 | ||||
| -rw-r--r-- | tests/dom_tests/dom_utils_test.coffee | 8 | ||||
| -rw-r--r-- | tests/unit_tests/utils_test.coffee | 2 |
3 files changed, 23 insertions, 3 deletions
diff --git a/lib/dom_utils.coffee b/lib/dom_utils.coffee index 38b23202..70e52a6c 100644 --- a/lib/dom_utils.coffee +++ b/lib/dom_utils.coffee @@ -46,11 +46,21 @@ DomUtils = # getVisibleClientRect: (element) -> # Note: this call will be expensive if we modify the DOM in between calls. - clientRects = element.getClientRects() + clientRects = ({ + top: clientRect.top, right: clientRect.right, bottom: clientRect.bottom, left: clientRect.left, + width: clientRect.width, height: clientRect.height + } for clientRect in element.getClientRects()) for clientRect in clientRects - if (clientRect.top < -2 || clientRect.top >= window.innerHeight - 4 || - clientRect.left < -2 || clientRect.left >= window.innerWidth - 4) + if (clientRect.top < 0) + clientRect.height += clientRect.top + clientRect.top = 0 + + if (clientRect.left < 0) + clientRect.width += clientRect.left + clientRect.left = 0 + + if (clientRect.top >= window.innerHeight - 4 || clientRect.left >= window.innerWidth - 4) continue if (clientRect.width < 3 || clientRect.height < 3) diff --git a/tests/dom_tests/dom_utils_test.coffee b/tests/dom_tests/dom_utils_test.coffee index d0f881ba..130a3014 100644 --- a/tests/dom_tests/dom_utils_test.coffee +++ b/tests/dom_tests/dom_utils_test.coffee @@ -42,6 +42,14 @@ context "Check visibility", assert.equal null, DomUtils.getVisibleClientRect document.getElementById 'foo' assert.equal null, DomUtils.getVisibleClientRect document.getElementById 'bar' + should "detect links only partially outside viewport as visible", -> + document.getElementById("test-div").innerHTML = """ + <a id='foo' style='position:absolute;top:-10px'>test</a> + <a id='bar' style='position:absolute;left:-10px'>test</a> + """ + assert.isTrue (DomUtils.getVisibleClientRect document.getElementById 'foo') != null + assert.isTrue (DomUtils.getVisibleClientRect document.getElementById 'bar') != null + should "detect opacity:0 links as hidden", -> document.getElementById("test-div").innerHTML = """ <a id='foo' style='opacity:0'>test</a> diff --git a/tests/unit_tests/utils_test.coffee b/tests/unit_tests/utils_test.coffee index e1aa32c7..91a06135 100644 --- a/tests/unit_tests/utils_test.coffee +++ b/tests/unit_tests/utils_test.coffee @@ -1,5 +1,7 @@ require "./test_helper.js" extend(global, require "../../lib/utils.js") +Utils.getCurrentVersion = -> '1.43' +global.localStorage = {} extend(global, require "../../background_scripts/settings.js") context "isUrl", |