Start in insert mode if user is in a text input

Fixes issue #37
flippidippi · Aug 31, 2017 · b21652a · b21652a
1 parent 190aa55
commit b21652a
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/sVim.safariextension/Info.plist b/sVim.safariextension/Info.plist
@@ -5,17 +5,17 @@
 	<key>Author</key>
 	<string>Phillip Lanclos</string>
 	<key>Builder Version</key>
-	<string>12603.3.8</string>
+	<string>12604.1.38.1.6</string>
 	<key>CFBundleDisplayName</key>
 	<string>sVim</string>
 	<key>CFBundleIdentifier</key>
 	<string>com.flipxfx.svim</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0.5</string>
+	<string>1.0.6</string>
 	<key>CFBundleVersion</key>
-	<string>105</string>
+	<string>106</string>
 	<key>Chrome</key>
 	<dict>
 		<key>Database Quota</key>

diff --git a/sVim.safariextension/sVimTab.js b/sVim.safariextension/sVimTab.js
@@ -327,7 +327,9 @@ sVimTab.bind = function() {
 
   // Bind shortcuts to commands
   for (var shortcut in sVimTab.settings.shortcuts) {
-    var command = sVimTab.settings.shortcuts[shortcut];
+    var command = sVimTab.settings.shortcuts[shortcut],
+      element = document.activeElement;
+
     // Replace <Leader>
     shortcut = shortcut.replace(/<[lL]eader>/g, sVimTab.settings.mapleader);
     // Bind going into normal mode even in textboxes
@@ -348,7 +350,12 @@ sVimTab.bind = function() {
   }
 
   // Default to normal mode
-  sVimTab.commands["normalMode"]();
+  if (element && sVimHelper.isElementInput(element)) {
+    sVimTab.commands["insertMode"]();
+  }
+  else {
+    sVimTab.commands["normalMode"]();
+  }
 };
 
 // Prevent propagation for all keydown events if in normal mode, non-escape key is pressed or active element is input