From d57b08232513b285360b220dbb4de91bc6b61765 Mon Sep 17 00:00:00 2001
From: Stephen Blott
Date: Mon, 26 Jan 2015 11:30:21 +0000
Subject: Visual/edit modes: fix problem resuming insert mode.

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

(limited to 'content_scripts/mode_visual_edit.coffee')

diff --git a/content_scripts/mode_visual_edit.coffee b/content_scripts/mode_visual_edit.coffee
index 1271a7fe..ff9114e9 100644
--- a/content_scripts/mode_visual_edit.coffee
+++ b/content_scripts/mode_visual_edit.coffee
@@ -456,12 +456,14 @@ class EditMode extends Movement
     @launchSubMode VisualMode, extend defaults, options
 
   enterInsertMode: () ->
-    @launchSubMode InsertMode, badge: "I", blurOnEscape: false
+    @launchSubMode InsertMode,
+      exitOnEscape: true
+      targetElement: @options.targetElement
 
   launchSubMode: (mode, options = {}) ->
     @lastSubMode =
       mode: mode
-      instance: new mode extend options, editModeParent: @
+      instance: Mode.cloneMode mode, extend options, editModeParent: @
 
   pasteClipboard: (direction) ->
     @paste (text) =>
@@ -521,8 +523,9 @@ class SuspendedEditMode extends Mode
         @alwaysContinueBubbling =>
           if event?.target == editModeOptions.singleton
             console.log "#{@id}: reactivating edit mode" if @debug
-            editMode = new EditMode editModeOptions
-            editMode.launchSubMode lastSubMode.mode, lastSubMode.instance.options if lastSubMode
+            editMode = Mode.cloneMode EditMode, editModeOptions
+            if lastSubMode
+              editMode.launchSubMode lastSubMode.mode, lastSubMode.instance.options
       keypress: (event) =>
         @alwaysContinueBubbling =>
           @exit() unless event.metaKey or event.ctrlKey or event.altKey
-- 
cgit v1.2.3