Merge branch '2.5' into 2.x

bower.json

@@ -1,6 +1,6 @@
 {
     "name": "jquery.inputmask",
-    "version": "2.4.30",
+    "version": "2.5.0-alpha",
     "main": "./dist/jquery.inputmask.bundle.js",
 	"keywords" : ["jQuery", "plugins", "input", "form", "inputmask", "mask"],
 	"description": "jquery.inputmask is a jquery plugin which create an input mask.",

dist/min/jquery.inputmask.phone.extensions.js

@@ -1 +0,0 @@
-(function(a){a.extend(a.inputmask.defaults.aliases,{phone:{url:"phone-codes/phone-codes.json",mask:function(c){c.definitions={p:{validator:function(){return!1},cardinality:1},"#":{validator:"[0-9]",cardinality:1}};var b=[];a.ajax({url:c.url,async:!1,dataType:"json",success:function(a){b=a}});b.splice(0,0,"+p(ppp)ppp-pppp");return b}}})})(jQuery);

js/jquery.inputmask.js

@@ -1192,7 +1192,7 @@
                 var caretPos = caret(input),
                     currentValue = input._valueGet();
 
-                if (currentValue.charAt(caretPos.begin) != getActiveBuffer()[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;
@@ -1200,11 +1200,12 @@
                 } 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) {