From acbff2c6c67dffda66fa87a3bddff7d193498706 Mon Sep 17 00:00:00 2001
From: Stephen Blott
Date: Thu, 29 Jan 2015 08:26:46 +0000
Subject: Visual/edit modes: really fix restore of insert-mode sub mode.

---
 content_scripts/mode.coffee | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'content_scripts')

diff --git a/content_scripts/mode.coffee b/content_scripts/mode.coffee
index bda8672c..a69c90a7 100644
--- a/content_scripts/mode.coffee
+++ b/content_scripts/mode.coffee
@@ -151,10 +151,11 @@ class Mode
   # case), because they do not need to be concerned with the value they yield.
   alwaysContinueBubbling: handlerStack.alwaysContinueBubbling
 
-  # Get a copy of the configuration options for this mode (that is, excluding the main keyboard-event
-  # handlers).
+  # Get a copy of the configuration options for this mode, but excluding the main keyboard-event handlers.
   getConfigurationOptions: ->
-    extend (extend {}, @options), keydown: null, keypress: null, keyup: null
+    options = extend {}, @options
+    delete options[key] for key in [ "keydown", "keypress", "keyup" ]
+    options
 
   # Static method.  Used externally and internally to initiate bubbling of an updateBadge event and to send
   # the resulting badge to the background page.  We only update the badge if this document (hence this frame)
-- 
cgit v1.2.3