Merge branch '2.x' into 2.6

build.properties

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

jquery.inputmask.jquery.json

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

js/jquery.inputmask.js

@@ -1126,7 +1126,7 @@
                 clearBuffer(getActiveBuffer(), pos.begin, pos.end);
 
                 var ml = getMaskLength();
-                if (opts.greedy == false) {
+                if (opts.greedy == false && (isNaN(opts.repeat) || opts.repeat > 0)) {
                     shiftL(pos.begin, ml, undefined, !isRTL && (k == opts.keyCode.BACKSPACE && !isSelection));
                 } else {
                     var newpos = pos.begin;

qunit/tests.js

@@ -346,6 +346,37 @@ test("inputmask(\"99 999 999 999 9999 \\D\\E*** 9999\") ~ value=\"01650103002000
     $("#testmask").remove();
 });
 
+test("inputmask(\"99 999 999 999 9999 \\D\\E*** 9999\") ~ value=\"016501030020001DE1015170\" replace 002 with 003 - wuSam", function () {
+    $('body').append('<input type="text" id="testmask" value="016501030020001DE1015170" />');
+    $("#testmask").inputmask("99 999 999 999 9999 \\D\\E*** 9999");
+    caret($("#testmask"), 11, 14);
+	$("#testmask").Type("003");
+	equal($("#testmask").val(), "01 650 103 003 0001 DE101 5170", "Result " + $("#testmask").val());
+	
+    $("#testmask").remove();
+});
+
+test("inputmask(\"99 999 999 999 9999 \\D\\E*** 9999\") ~ value=\"016501030020001DE1015170\" replace 02 with 01 - wuSam", function () {
+    $('body').append('<input type="text" id="testmask" value="016501030020001DE1015170" />');
+    $("#testmask").inputmask("99 999 999 999 9999 \\D\\E*** 9999");
+    caret($("#testmask"), 12, 14);
+	$("#testmask").Type("01");
+	equal($("#testmask").val(), "01 650 103 001 0001 DE101 5170", "Result " + $("#testmask").val());
+	
+    $("#testmask").remove();
+});
+
+test("inputmask(\"99 999 999 999 9999 \\D\\E*** 9999\", { greedy: false }) ~ value=\"016501030020001DE1015170\" replace 02 with 01 - wuSam", function () {
+    $('body').append('<input type="text" id="testmask" value="016501030020001DE1015170" />');
+    $("#testmask").inputmask("99 999 999 999 9999 \\D\\E*** 9999", { greedy:false });
+    caret($("#testmask"), 12, 14);
+	$("#testmask").Type("01");
+	equal($("#testmask").val(), "01 650 103 001 0001 DE101 5170", "Result " + $("#testmask").val());
+	
+    $("#testmask").remove();
+});
+
+
 test("inputmask(\"\\D\\E***\") ~ value=\"DE001\" - wuSam", function () {
     $('body').append('<input type="text" id="testmask" value="DE001" />');
     $("#testmask").inputmask("\\D\\E***");