Fix caret jumping to end while inserting text

Gruntfile.js

@@ -79,6 +79,19 @@ module.exports = function(grunt) {
 						'!languages/*.untranslated.js'
 					]
 				}
+			},
+			greyLayouts: {
+				options: {
+					banner: nomod + '/*! jQuery UI Virtual Keyboard - Microsoft Generated Layouts */\n'
+				},
+				files: {
+					'dist/layouts/keyboard-layouts-greywyvern.min.js': [
+						'layouts/keyboard-layouts-greywyvern.js',
+						'languages/*.js',
+						'!languages/_language_template.js',
+						'!languages/*.untranslated.js'
+					]
+				}
 			}
 		},
 
@@ -125,17 +138,28 @@ module.exports = function(grunt) {
 					flatten: true
 				}]
 			},
-			layouts: {
+			splitLayouts: {
 				files: [{
 					expand: true,
 					cwd: '',
-					src: [ 'layouts/*.js', '!layouts/_layout_template.js' ],
+					src: [ 'layouts/*.js', '!layouts/_layout_template.js', '!layouts/keyboard-layouts-greywyvern.js' ],
 					dest: 'dist/layouts/',
 					ext: '.min.js',
 					extDot: 'last',
 					flatten: true
 				}]
 			},
+			greyLayout: {
+				files: [{
+					expand: true,
+					cwd: '',
+					src: [ 'dist/layouts/keyboard-layouts-greywyvern.min.js' ],
+					dest: 'dist/layouts/',
+					ext: '.js',
+					extDot: 'last',
+					flatten: true
+				}]
+			},
 			languages: {
 				files: [{
 					expand: true,

js/jquery.keyboard.js

@@ -906,7 +906,7 @@ var $keyboard = $.keyboard = function(el, options){
 		bksp = isBksp && pos.start === pos.end;
 		txt = isBksp ? '' : txt;
 		val = val.substr(0, pos.start - (bksp ? 1 : 0)) + txt + val.substr(pos.end);
-		t = pos.start + (bksp ? -1 : val.length);
+		t = pos.start + (bksp ? -1 : txt.length);
 
 		base.$preview.val( val );
 		base.saveCaret( t, t ); // save caret in case of bksp
@@ -1003,7 +1003,6 @@ var $keyboard = $.keyboard = function(el, options){
 			pos = $keyboard.caret( base.$preview ),
 			layout = $keyboard.builtLayouts[base.layout],
 			len = val.length; // save original content length
-
 		// return if val is empty; fixes #352
 		if (val === '') { return val; }
 
@@ -1062,7 +1061,6 @@ var $keyboard = $.keyboard = function(el, options){
 		pos.end += val.length - len;
 		base.$preview.val(val);
 		base.saveCaret( pos.start, pos.end );
-
 		// set scroll to keep caret in view
 		base.setScroll();