diff options
| author | Stephen Blott | 2014-12-19 08:49:01 +0000 |
|---|---|---|
| committer | Stephen Blott | 2014-12-19 08:49:01 +0000 |
| commit | 24b968943acddd224dd795c1e26425d3b75520e2 (patch) | |
| tree | 7ed9525c49d75a2f2b0b373a57afe3c962e8d7d5 | |
| parent | ac2e1077107d72ef82e1424634aa86945696e6b4 (diff) | |
| download | vimium-24b968943acddd224dd795c1e26425d3b75520e2.tar.bz2 | |
Delay initialization of activeElement.
We could incorrectly initialize activeElement to document.body if the
scroller is called too early; so delay initialization. It's safe to
leave activeElement as null.
| -rw-r--r-- | content_scripts/scroller.coffee | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/content_scripts/scroller.coffee b/content_scripts/scroller.coffee index dec817a1..3692a002 100644 --- a/content_scripts/scroller.coffee +++ b/content_scripts/scroller.coffee @@ -219,7 +219,7 @@ Scroller = window.scrollBy(0, amount) return - activatedElement ||= firstScrollableElement() || document.body + activatedElement ||= firstScrollableElement() return unless activatedElement # Avoid the expensive scroll calculation if it will not be used. This reduces costs during smooth, @@ -230,8 +230,8 @@ Scroller = CoreScroller.scroll element, direction, elementAmount scrollTo: (direction, pos) -> - return unless document.body or activatedElement - activatedElement ||= firstScrollableElement() || document.body + activatedElement ||= firstScrollableElement() + return unless activatedElement element = findScrollableElement activatedElement, direction, pos, 1 amount = getDimension(element,direction,pos) - element[scrollProperties[direction].axisName] |