aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Blott2015-03-11 05:59:40 +0000
committerStephen Blott2015-03-11 05:59:40 +0000
commitc0208ac0f34101630e99f58e9cb79da405f34be5 (patch)
treeb181944dfbaaf62233b6b69e107f7ae14712caa8
parent2db6971cbeffcdf24c42936fbae3c596f1bbecf0 (diff)
parent0514b0634ab45702e88f60df665526f1be42cbf5 (diff)
downloadvimium-c0208ac0f34101630e99f58e9cb79da405f34be5.tar.bz2
Merge pull request #1527 from smblott-github/fix-scrolling
Move Scroller.init() up the handler stack.
-rw-r--r--content_scripts/vimium_frontend.coffee3
1 files changed, 1 insertions, 2 deletions
diff --git a/content_scripts/vimium_frontend.coffee b/content_scripts/vimium_frontend.coffee
index 66922084..bc56e175 100644
--- a/content_scripts/vimium_frontend.coffee
+++ b/content_scripts/vimium_frontend.coffee
@@ -133,8 +133,6 @@ window.initializeModes = ->
keypress: (event) => onKeypress.call @, event
keyup: (event) => onKeyup.call @, event
- Scroller.init settings
-
# Install the permanent modes. The permanently-installed insert mode tracks focus/blur events, and
# activates/deactivates itself accordingly.
new BadgeMode
@@ -142,6 +140,7 @@ window.initializeModes = ->
new PassKeysMode
new InsertMode permanent: true
new GrabBackFocus
+ Scroller.init settings
#
# Complete initialization work that sould be done prior to DOMReady.