Merge pull request #40 from FieldVal/develop

Switched tab insertion method to document.executeCommand
FieldVal · Apr 9, 2015 · bb12749 · bb12749
2 parents 03f6a69 + 446f5fc
commit bb12749
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 24 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
 	"name": "fieldval-ui",
-	"version": "0.4.3",
+	"version": "0.4.4",
 	"main": "fieldval-ui.js",
 	"ignore": [
 		"bower_components",

diff --git a/fieldval-ui.js b/fieldval-ui.js
@@ -361,17 +361,9 @@ function FVTextField(name, options) {
             }
         }
 
-        if(field.consume_tabs && e.keyCode===9) {
+        if(field.input_type==="textarea" && field.consume_tabs && e.keyCode===9) {
             e.preventDefault();
-            var start = $(this).get(0).selectionStart;
-            var end = $(this).get(0).selectionEnd;
-
-            // set textarea value to: text before caret + tab + text after caret
-            $(this).val($(this).val().substring(0, start) + "\t" + $(this).val().substring(end));
-
-            // put caret at right position again
-            $(this).get(0).selectionStart =
-            $(this).get(0).selectionEnd = start + 1;
+            document.execCommand("insertText", false, "\t");
         }
     })
     .on("keyup paste cut",function(){

diff --git a/fieldval-ui.min.js b/fieldval-ui.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "fieldval-ui",
-  "version": "0.4.3",
+  "version": "0.4.4",
   "description": "fieldval-ui",
   "main": "fieldval-ui.js",
   "scripts": {

diff --git a/src/FVField/FVTextField/FVTextField.js b/src/FVField/FVTextField/FVTextField.js
@@ -47,17 +47,9 @@ function FVTextField(name, options) {
             }
         }
 
-        if(field.consume_tabs && e.keyCode===9) {
+        if(field.input_type==="textarea" && field.consume_tabs && e.keyCode===9) {
             e.preventDefault();
-            var start = $(this).get(0).selectionStart;
-            var end = $(this).get(0).selectionEnd;
-
-            // set textarea value to: text before caret + tab + text after caret
-            $(this).val($(this).val().substring(0, start) + "\t" + $(this).val().substring(end));
-
-            // put caret at right position again
-            $(this).get(0).selectionStart =
-            $(this).get(0).selectionEnd = start + 1;
+            document.execCommand("insertText", false, "\t");
         }
     })
     .on("keyup paste cut",function(){