diff options
Diffstat (limited to 'content_scripts')
| -rw-r--r-- | content_scripts/mode.coffee | 2 | ||||
| -rw-r--r-- | content_scripts/mode_insert.coffee | 5 | ||||
| -rw-r--r-- | content_scripts/scroller.coffee | 4 | ||||
| -rw-r--r-- | content_scripts/vimium_frontend.coffee | 4 |
4 files changed, 8 insertions, 7 deletions
diff --git a/content_scripts/mode.coffee b/content_scripts/mode.coffee index c1dea59a..2d8cc9cc 100644 --- a/content_scripts/mode.coffee +++ b/content_scripts/mode.coffee @@ -81,7 +81,7 @@ class Mode _name: "mode-#{@id}/exitOnEscape" "keydown": (event) => return @continueBubbling unless KeyboardUtils.isEscape event - @exit event, event.srcElement + @exit event, event.target DomUtils.suppressKeyupAfterEscape handlerStack # If @options.exitOnBlur is truthy, then it should be an element. The mode will exit when that element diff --git a/content_scripts/mode_insert.coffee b/content_scripts/mode_insert.coffee index d5d98297..73a24112 100644 --- a/content_scripts/mode_insert.coffee +++ b/content_scripts/mode_insert.coffee @@ -10,6 +10,7 @@ class InsertMode extends Mode handleKeyEvent = (event) => return @continueBubbling unless @isActive event + return @passEventToPage if @insertModeLock is document.body # Check for a pass-next-key key. if KeyboardUtils.getKeyCharString(event) in Settings.get "passNextKeyKeys" @@ -17,14 +18,14 @@ class InsertMode extends Mode return @suppressEvent return @passEventToPage unless event.type == 'keydown' and KeyboardUtils.isEscape event - target = event.srcElement + target = event.target if target and DomUtils.isFocusable target # Remove the focus, so the user can't just get back into insert mode by typing in the same input box. target.blur() else if target?.shadowRoot and @insertModeLock # An editable element in a shadow DOM is focused; blur it. @insertModeLock.blur() - @exit event, event.srcElement + @exit event, event.target DomUtils.suppressKeyupAfterEscape handlerStack defaults = 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: -> |