Let handlerStack call consumeKeyup rather than calling it explicitly

6 files changed, 11 insertions, 9 deletions

diff --git a/content_scripts/link_hints.coffee b/content_scripts/link_hints.coffee
index 7d3cd91c..33a876e0 100644
--- a/content_scripts/link_hints.coffee
+++ b/content_scripts/link_hints.coffee
@@ -293,7 +293,7 @@ class LinkHintsMode
           if keyChar.length == 1
             @markerMatcher.pushKeyChar keyChar
             @updateVisibleMarkers()
-          DomUtils.consumeKeyup event
+          handlerStack.suppressEvent
       return
 
     # We've handled the event, so suppress it and update the mode indicator.
diff --git a/content_scripts/marks.coffee b/content_scripts/marks.coffee
index 55f3137c..ac653a52 100644
--- a/content_scripts/marks.coffee
+++ b/content_scripts/marks.coffee
@@ -52,7 +52,7 @@ Marks =
             else
               localStorage[@getLocationKey keyChar] = @getMarkString()
               @showMessage "Created local mark", keyChar
-          DomUtils.consumeKeyup event
+          handlerStack.suppressEvent
 
   activateGotoMode: ->
     @mode = new Mode
@@ -82,7 +82,7 @@ Marks =
                 @showMessage "Jumped to local mark", keyChar
               else
                 @showMessage "Local mark not set", keyChar
-          DomUtils.consumeKeyup event
+          handlerStack.suppressEvent
 
 root = exports ? (window.root ?= {})
 root.Marks =  Marks
diff --git a/content_scripts/mode.coffee b/content_scripts/mode.coffee
index 6f4bed29..a4a91c1f 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.consumeKeyup event
+          @suppressEvent
 
     # 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 12c3bb1a..0fc147a3 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.consumeKeyup event
+          @suppressEvent
         else
           handlerStack.remove()
           @continueBubbling
diff --git a/content_scripts/mode_insert.coffee b/content_scripts/mode_insert.coffee
index f512574c..d2a33091 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.consumeKeyup event
+      @suppressEvent
 
     defaults =
       name: "insert"
diff --git a/content_scripts/mode_key_handler.coffee b/content_scripts/mode_key_handler.coffee
index 0e84b9fb..a8ef957d 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.consumeKeyup event
+            @suppressEvent
           else
             @continueBubbling
 
@@ -49,11 +49,13 @@ class KeyHandlerMode extends Mode
       DomUtils.consumeKeyup event, => @reset()
     # If the help dialog loses the focus, then Escape should hide it; see point 2 in #2045.
     else if isEscape and HelpDialog?.isShowing()
-      DomUtils.consumeKeyup event, -> HelpDialog.toggle()
+      HelpDialog.toggle()
+      @suppressEvent
     else if isEscape
       @continueBubbling
     else if @isMappedKey keyChar
-      DomUtils.consumeKeyup event, => @handleKeyChar keyChar
+      @handleKeyChar keyChar
+      @suppressEvent
     else if @isCountKey keyChar
       digit = parseInt keyChar
       @reset if @keyState.length == 1 then @countPrefix * 10 + digit else digit