Modes; Continue incorporation of comments in #1413.

- Slight rework of HandlerStack.
- Remove classs ExitOnEscape and ExitOnBlur
- Rework InsertMode, plus trigger and blocker.
- Remove StateMode.
- Do no mixin options.
- Lots of tidy up (including set a debug variable to Mode).

1 files changed, 9 insertions, 8 deletions

diff --git a/content_scripts/mode_passkeys.coffee b/content_scripts/mode_passkeys.coffee
index c8afed39..972dcad7 100644
--- a/content_scripts/mode_passkeys.coffee
+++ b/content_scripts/mode_passkeys.coffee
@@ -1,7 +1,11 @@
 
-class PassKeysMode extends StateMode
-  configure: (request) ->
-    @keyQueue = request.keyQueue if request.keyQueue?
+class PassKeysMode extends Mode
+  constructor: ->
+    super
+      name: "passkeys"
+      keydown: (event) => @handlePassKeyEvent event
+      keypress: (event) => @handlePassKeyEvent event
+      trackState: true
 
   # Decide whether this event should be passed to the underlying page.  Keystrokes are *never* considered
   # passKeys if the keyQueue is not empty.  So, for example, if 't' is a passKey, then 'gt' and '99t' will
@@ -11,11 +15,8 @@ class PassKeysMode extends StateMode
       return @stopBubblingAndTrue if keyChar and not @keyQueue and 0 <= @passKeys.indexOf(keyChar)
     @continueBubbling
 
-  constructor: ->
-    super
-      name: "passkeys"
-      keydown: (event) => @handlePassKeyEvent event
-      keypress: (event) => @handlePassKeyEvent event
+  configure: (request) ->
+    @keyQueue = request.keyQueue if request.keyQueue?
 
   chooseBadge: (badge) ->
     @badge = if @passKeys and not @keyQueue then "P" else ""