From 4c32c0383964e178e0196a87df7fc7a4ad7f8f27 Mon Sep 17 00:00:00 2001
From: Stephen Blott
Date: Fri, 14 Apr 2017 07:48:56 +0100
Subject: Use event.code to detect/suppress keyup events.

This avoids the possibility of leaking keyup events if the keys a
released in a different order from that in which they were pressed.

Also, replace suppressKeyupAfterEscape with this same mechanism.

This fixes a bug (in master/1.59) whereby we leak the keyup event for
`i` when entering insert mode.

TODO:

- `/`, `<Escape>` leaks a keyup event
- `i` leaks a keyup event
---
 content_scripts/mode.coffee             | 2 +-
 content_scripts/mode_find.coffee        | 2 +-
 content_scripts/mode_insert.coffee      | 2 +-
 content_scripts/mode_key_handler.coffee | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'content_scripts')

diff --git a/content_scripts/mode.coffee b/content_scripts/mode.coffee
index 2d8cc9cc..85187b2c 100644
--- a/content_scripts/mode.coffee
+++ b/content_scripts/mode.coffee
@@ -82,7 +82,7 @@ class Mode
         "keydown": (event) =>
           return @continueBubbling unless KeyboardUtils.isEscape event
           @exit event, event.target
-          DomUtils.suppressKeyupAfterEscape handlerStack
+          DomUtils.consumeKeyup event
 
     # If @options.exitOnBlur is truthy, then it should be an element.  The mode will exit when that element
     # loses the focus.
diff --git a/content_scripts/mode_find.coffee b/content_scripts/mode_find.coffee
index 63825600..77d3762d 100644
--- a/content_scripts/mode_find.coffee
+++ b/content_scripts/mode_find.coffee
@@ -48,7 +48,7 @@ class PostFindMode extends SuppressPrintable
       keydown: (event) =>
         if KeyboardUtils.isEscape event
           @exit()
-          DomUtils.suppressKeyupAfterEscape handlerStack
+          DomUtils.consumeKeyup event
         else
           handlerStack.remove()
           @continueBubbling
diff --git a/content_scripts/mode_insert.coffee b/content_scripts/mode_insert.coffee
index 73a24112..a4f1836d 100644
--- a/content_scripts/mode_insert.coffee
+++ b/content_scripts/mode_insert.coffee
@@ -26,7 +26,7 @@ class InsertMode extends Mode
         # An editable element in a shadow DOM is focused; blur it.
         @insertModeLock.blur()
       @exit event, event.target
-      DomUtils.suppressKeyupAfterEscape handlerStack
+      DomUtils.consumeKeyup event
 
     defaults =
       name: "insert"
diff --git a/content_scripts/mode_key_handler.coffee b/content_scripts/mode_key_handler.coffee
index f306ea06..1b3b21e7 100644
--- a/content_scripts/mode_key_handler.coffee
+++ b/content_scripts/mode_key_handler.coffee
@@ -38,7 +38,7 @@ class KeyHandlerMode extends Mode
         keydown: (event) =>
           if KeyboardUtils.isEscape(event) and not @isInResetState()
             @reset()
-            DomUtils.suppressKeyupAfterEscape handlerStack
+            DomUtils.consumeKeyup event
           else
             @continueBubbling
 
-- 
cgit v1.2.3