Merge branch '2.x' into 2.6

build.properties

@@ -7,7 +7,7 @@ distdir = dist
 
 build.major = 2
 build.minor = 4
-build.revision = 30
+build.revision = 31
 
 target = jquery.inputmask.bundle.js
 target.min = jquery.inputmask.bundle.min.js

jquery.inputmask.jquery.json

@@ -8,7 +8,7 @@
 		"inputmask",
 		"mask"
     ],
-    "version": "2.4.30",
+    "version": "2.4.31",
     "author": {
         "name": "Robin Herbots",
         "url": "http://github.com/RobinHerbots/jquery.inputmask"

js/jquery.inputmask.js

@@ -1397,19 +1397,20 @@
                 var caretPos = caret(input),
                     currentValue = input._valueGet();
 
-                if (currentValue.charAt(caretPos.begin) != getActiveBuffer()[caretPos.begin]
-              	  	&& currentValue.charAt(caretPos.begin + 1) != getActiveBuffer()[caretPos.begin]
-                	&& !isMask(caretPos.begin)) {
+                if ((getActiveBuffer().length - currentValue.length) == 1 && currentValue.charAt(caretPos.begin) != getActiveBuffer()[caretPos.begin]
+                    && currentValue.charAt(caretPos.begin + 1) != getActiveBuffer()[caretPos.begin]
+                    && !isMask(caretPos.begin)) {
                     e.keyCode = opts.keyCode.BACKSPACE;
                     keydownEvent.call(input, e);
                 } else { //nonnumerics don't fire keypress 
                     checkVal(input, false, false);
                     writeBuffer(input, getActiveBuffer());
-                    if (isComplete(getActiveBuffer()) === true)
-                        $input.trigger("complete");
-                    $input.click();
+                    setTimeout(function () {
+                        caret(input, seekNext(caretPos.begin - 1));
+                        if (isComplete(getActiveBuffer()) === true)
+                            $input.trigger("complete");
+                    }, 0);
                 }
-                e.preventDefault();
             }
 
             function mask(el) {