aboutsummaryrefslogtreecommitdiffstats
path: root/content_scripts
diff options
context:
space:
mode:
authorStephen Blott2015-06-03 16:15:31 +0100
committerStephen Blott2015-06-03 16:15:31 +0100
commit8dab334fa2fde9d4815ce0a12c0d2ab9dd44ff05 (patch)
treeff30bf30fd38bdb5407a3fbec33366a23d4314be /content_scripts
parent6fa88abbad70c19d5f9d69acff0e16844a2629b6 (diff)
downloadvimium-8dab334fa2fde9d4815ce0a12c0d2ab9dd44ff05.tar.bz2
Also set previous position for before global mark movement.
Diffstat (limited to 'content_scripts')
-rw-r--r--content_scripts/mode.coffee3
-rw-r--r--content_scripts/vimium_frontend.coffee4
2 files changed, 4 insertions, 3 deletions
diff --git a/content_scripts/mode.coffee b/content_scripts/mode.coffee
index 22b6120f..86d3e011 100644
--- a/content_scripts/mode.coffee
+++ b/content_scripts/mode.coffee
@@ -52,8 +52,7 @@ class Mode
# and 2) worry about their return value.
if @options.suppressAllKeyboardEvents
for type in [ "keydown", "keypress", "keyup" ]
- do (type) =>
- handler = @options[type]
+ do (handler = @options[type]) =>
@options[type] = (event) => handler? event; @stopBubblingAndFalse
@push
diff --git a/content_scripts/vimium_frontend.coffee b/content_scripts/vimium_frontend.coffee
index 9ff9b6db..fec0dae2 100644
--- a/content_scripts/vimium_frontend.coffee
+++ b/content_scripts/vimium_frontend.coffee
@@ -266,7 +266,9 @@ executePageCommand = (request) ->
setScrollPosition = (scrollX, scrollY) ->
if (scrollX > 0 || scrollY > 0)
- DomUtils.documentReady(-> window.scrollTo(scrollX, scrollY))
+ DomUtils.documentReady ->
+ Marks.markPosition()
+ window.scrollTo scrollX, scrollY
#
# Called from the backend in order to change frame focus.