Merge branch '1.x' into 2.x

RobinHerbots · Mar 20, 2013 · 9f13d58 · 9f13d58
2 parents 4931426 + 53fff1c
commit 9f13d58
Show file tree

Hide file tree

Showing 5 changed files with 54 additions and 48 deletions.
diff --git a/dist/jQuery.InputMask.2.1.8.nupkg b/dist/jQuery.InputMask.2.1.8.nupkg
diff --git a/dist/jquery.inputmask.bundle.js b/dist/jquery.inputmask.bundle.js
@@ -2003,7 +2003,10 @@ Optional extensions on the jquery.inputmask base
         },
         'integer': {
             regex: {
-                number: function (groupSeparator, groupSize) { return new RegExp("^([\+\-]?\\d*)$"); }
+                number: function (groupSeparator, groupSize) {
+                    var escapedGroupSeparator = $.inputmask.escapeRegex.call(this, groupSeparator);
+                    return new RegExp("^[\+-]?(\\d+|\\d{1," + groupSize + "}((" + escapedGroupSeparator + "\\d{" + groupSize + "})?)+)$");
+                }
             },
             alias: "decimal"
         }