diff options
| author | Stephen Blott | 2017-10-31 07:01:46 +0000 |
|---|---|---|
| committer | GitHub | 2017-10-31 07:01:46 +0000 |
| commit | fb081c8963196926cd8c5ab6d16b3d5928f8198f (patch) | |
| tree | eaa7f453c09146edf480f39b774cae125e90e3df /lib | |
| parent | 0c58201095059edd7b8b6e7e76792376c4bd8b3d (diff) | |
| parent | df16e038e0029f1ea7883c0a087505f452285d3b (diff) | |
| download | vimium-fb081c8963196926cd8c5ab6d16b3d5928f8198f.tar.bz2 | |
Merge pull request #2753 from mrmr1993/always-consume-keyup
Always suppress keyups for keydowns that we handle, enforced in handlerStack
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/dom_utils.coffee | 3 | ||||
| -rw-r--r-- | lib/handler_stack.coffee | 6 |
2 files changed, 7 insertions, 2 deletions
diff --git a/lib/dom_utils.coffee b/lib/dom_utils.coffee index e771d436..b44f5f51 100644 --- a/lib/dom_utils.coffee +++ b/lib/dom_utils.coffee @@ -353,7 +353,8 @@ DomUtils = keyup: (event) -> return handlerStack.continueBubbling unless event.code == code @remove() - handlerStack.suppressEvent + DomUtils.suppressEvent event + handlerStack.continueBubbling # We cannot track keyup events if we lose the focus. blur: (event) -> @remove() if event.target == window diff --git a/lib/handler_stack.coffee b/lib/handler_stack.coffee index 2439f55c..646ddfbd 100644 --- a/lib/handler_stack.coffee +++ b/lib/handler_stack.coffee @@ -65,7 +65,11 @@ class HandlerStack true # Do nothing, but continue bubbling. else # result is @suppressEvent or falsy. - DomUtils.suppressEvent event if @isChromeEvent event + if @isChromeEvent event + if type == "keydown" + DomUtils.consumeKeyup event + else + DomUtils.suppressEvent event return false # None of our handlers care about this event, so pass it to the page. |