diff options
| author | Stephen Blott | 2014-12-16 10:19:18 +0000 |
|---|---|---|
| committer | Stephen Blott | 2014-12-16 10:19:18 +0000 |
| commit | 0b3a242841f7badb069840dec80a24d38d4e843a (patch) | |
| tree | 868dc7f35a64bc17f93464a61a9111dbf24a7c7e /content_scripts/scroller.coffee | |
| parent | bea41e9c695f3b3f8e921880b3d40b681ca387b0 (diff) | |
| parent | 23ce72b0e845d2c4a1469f629cd1abd70dce6652 (diff) | |
| download | vimium-0b3a242841f7badb069840dec80a24d38d4e843a.tar.bz2 | |
Merge remote-tracking branch 'upstream/master' into post-1.46
Diffstat (limited to 'content_scripts/scroller.coffee')
| -rw-r--r-- | content_scripts/scroller.coffee | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/content_scripts/scroller.coffee b/content_scripts/scroller.coffee index 5eb1c5e2..a2617289 100644 --- a/content_scripts/scroller.coffee +++ b/content_scripts/scroller.coffee @@ -34,12 +34,12 @@ getDimension = (el, direction, amount) -> else amount -# Perform a scroll. Return true if we successfully scrolled by the requested amount, and false otherwise. +# Perform a scroll. Return true if we successfully scrolled by any amount, and false otherwise. performScroll = (element, direction, amount) -> axisName = scrollProperties[direction].axisName before = element[axisName] element[axisName] += amount - element[axisName] == amount + before + element[axisName] != before # Test whether `element` should be scrolled. E.g. hidden elements should not be scrolled. shouldScroll = (element, direction) -> |