aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Blott2017-03-04 07:39:08 +0000
committerGitHub2017-03-04 07:39:08 +0000
commit0d239c338c04b5fdbdfbcbf13614c341383429a2 (patch)
tree202d186ab38da309bff0774e7d81c4e47ebe892d
parent771b0abc9d60a31d29cb59de6edfe529a5e3005c (diff)
parent3f8026dfc1ce12fb179b758f84254e34e65ac339 (diff)
downloadvimium-0d239c338c04b5fdbdfbcbf13614c341383429a2.tar.bz2
Merge pull request #2428 from mrmr1993/use-event-argument
Use event argument instead of global event object
-rw-r--r--content_scripts/scroller.coffee4
-rw-r--r--content_scripts/vimium_frontend.coffee4
2 files changed, 4 insertions, 4 deletions
diff --git a/content_scripts/scroller.coffee b/content_scripts/scroller.coffee
index b4a0d799..56862d49 100644
--- a/content_scripts/scroller.coffee
+++ b/content_scripts/scroller.coffee
@@ -143,11 +143,11 @@ CoreScroller =
@keyIsDown = true
@time += 1 unless event.repeat
@lastEvent = event
- keyup: =>
+ keyup: (event) =>
handlerStack.alwaysContinueBubbling =>
@keyIsDown = false
@time += 1
- blur: =>
+ blur: (event) =>
handlerStack.alwaysContinueBubbling =>
@time += 1 if event.target == window
diff --git a/content_scripts/vimium_frontend.coffee b/content_scripts/vimium_frontend.coffee
index 6447092b..93238642 100644
--- a/content_scripts/vimium_frontend.coffee
+++ b/content_scripts/vimium_frontend.coffee
@@ -248,9 +248,9 @@ Frame =
window.removeEventListener "focus", focusHandler
window.removeEventListener "resize", resizeHandler
Frame.postMessage "registerFrame"
- window.addEventListener "focus", focusHandler = ->
+ window.addEventListener "focus", focusHandler = (event) ->
postRegisterFrame() if event.target == window
- window.addEventListener "resize", resizeHandler = ->
+ window.addEventListener "resize", resizeHandler = (event) ->
postRegisterFrame() unless DomUtils.windowIsTooSmall()
init: ->