diff options
| author | Stephen Blott | 2015-01-10 18:53:28 +0000 |
|---|---|---|
| committer | Stephen Blott | 2015-01-10 18:53:28 +0000 |
| commit | d1c0a5d9bd1f67f2b32a993cfd62bc0b52c44185 (patch) | |
| tree | 76eaa3b86be1c6ac130724168d0bf3bbbb6849c5 /content_scripts/scroller.coffee | |
| parent | 93de6384632e3e682e02be4cb8cea160997de127 (diff) | |
| parent | 80ad0bc3087a3bf00d61bdd6c9cf48e971e22480 (diff) | |
| download | vimium-d1c0a5d9bd1f67f2b32a993cfd62bc0b52c44185.tar.bz2 | |
Merge branch 'modes-dev' into modes
Diffstat (limited to 'content_scripts/scroller.coffee')
| -rw-r--r-- | content_scripts/scroller.coffee | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/content_scripts/scroller.coffee b/content_scripts/scroller.coffee index 889dc042..6e2e1ffc 100644 --- a/content_scripts/scroller.coffee +++ b/content_scripts/scroller.coffee @@ -124,12 +124,15 @@ CoreScroller = @keyIsDown = false handlerStack.push + _name: 'scroller/track-key-status' keydown: (event) => - @keyIsDown = true - @lastEvent = event + handlerStack.alwaysContinueBubbling => + @keyIsDown = true + @lastEvent = event keyup: => - @keyIsDown = false - @time += 1 + handlerStack.alwaysContinueBubbling => + @keyIsDown = false + @time += 1 # Return true if CoreScroller would not initiate a new scroll right now. wouldNotInitiateScroll: -> @lastEvent?.repeat and @settings.get "smoothScroll" @@ -205,7 +208,9 @@ CoreScroller = # Scroller contains the two main scroll functions (scrollBy and scrollTo) which are exported to clients. Scroller = init: (frontendSettings) -> - handlerStack.push DOMActivate: -> activatedElement = event.target + handlerStack.push + _name: 'scroller/active-element' + DOMActivate: (event) -> handlerStack.alwaysContinueBubbling -> activatedElement = event.target CoreScroller.init frontendSettings # scroll the active element in :direction by :amount * :factor. |