|
|
@@ -67,12 +67,12 @@ Optional extensions on the jquery.inputmask base
|
|
|
return reformatOnly ? pos : newPos <= radixPos || (opts.skipRadixDance && newPos != 0) ? newPos - 1 : newPos;
|
|
|
},
|
|
|
regex: {
|
|
|
- number: function (groupSeparator, groupSize, radixPoint, digits, allowPlus, allowMinus) {
|
|
|
- var escapedGroupSeparator = $.inputmask.escapeRegex.call(this, groupSeparator);
|
|
|
- var escapedRadixPoint = $.inputmask.escapeRegex.call(this, radixPoint);
|
|
|
- var digitExpression = isNaN(digits) ? digits : '{0,' + digits + '}';
|
|
|
- var signedExpression = "[" + (allowPlus ? "\+" : "") + (allowMinus ? "-" : "") + "]?";
|
|
|
- return new RegExp("^" + signedExpression + "(\\d+|\\d{1," + groupSize + "}((" + escapedGroupSeparator + "\\d{" + groupSize + "})?)+)(" + escapedRadixPoint + "\\d" + digitExpression + ")?$");
|
|
|
+ number: function (opts) {
|
|
|
+ var escapedGroupSeparator = $.inputmask.escapeRegex.call(this, opts.groupSeparator);
|
|
|
+ var escapedRadixPoint = $.inputmask.escapeRegex.call(this, opts.radixPoint);
|
|
|
+ var digitExpression = isNaN(opts.digits) ? opts.digits : '{0,' + opts.digits + '}';
|
|
|
+ var signedExpression = "[" + (opts.allowPlus ? "\+" : "") + (opts.allowMinus ? "-" : "") + "]?";
|
|
|
+ return new RegExp("^" + signedExpression + "(\\d+|\\d{1," + opts.groupSize + "}((" + escapedGroupSeparator + "\\d{" + opts.groupSize + "})?)+)(" + escapedRadixPoint + "\\d" + digitExpression + ")?$");
|
|
|
}
|
|
|
},
|
|
|
onKeyDown: function (e, buffer, opts) {
|
|
|
@@ -109,11 +109,11 @@ Optional extensions on the jquery.inputmask base
|
|
|
var escapedGroupSeparator = $.inputmask.escapeRegex.call(this, opts.groupSeparator);
|
|
|
bufferStr = bufferStr.replace(new RegExp(escapedGroupSeparator, "g"), '');
|
|
|
}
|
|
|
- var isValid = opts.regex.number(opts.groupSeparator, opts.groupSize, opts.radixPoint, opts.digits, opts.allowPlus, opts.allowMinus).test(bufferStr);
|
|
|
+ var isValid = opts.regex.number(opts).test(bufferStr);
|
|
|
if (!isValid) {
|
|
|
//let's help the regex a bit
|
|
|
bufferStr += "0";
|
|
|
- isValid = opts.regex.number(opts.groupSeparator, opts.groupSize, opts.radixPoint, opts.digits, opts.allowPlus, opts.allowMinus).test(bufferStr);
|
|
|
+ isValid = opts.regex.number(opts).test(bufferStr);
|
|
|
if (!isValid) {
|
|
|
//make a valid group
|
|
|
var lastGroupSeparator = bufferStr.lastIndexOf(opts.groupSeparator);
|
|
|
@@ -121,10 +121,10 @@ Optional extensions on the jquery.inputmask base
|
|
|
bufferStr += "0";
|
|
|
}
|
|
|
|
|
|
- isValid = opts.regex.number(opts.groupSeparator, opts.groupSize, opts.radixPoint, opts.digits, opts.allowPlus, opts.allowMinus).test(bufferStr);
|
|
|
+ isValid = opts.regex.number(opts).test(bufferStr);
|
|
|
if (!isValid && !strict) {
|
|
|
if (chrs == opts.radixPoint) {
|
|
|
- isValid = opts.regex.number(opts.groupSeparator, opts.groupSize, opts.radixPoint, opts.digits, opts.allowPlus, opts.allowMinus).test("0" + bufferStr + "0");
|
|
|
+ isValid = opts.regex.number(opts).test("0" + bufferStr + "0");
|
|
|
if (isValid) {
|
|
|
buffer[pos] = "0";
|
|
|
pos++;
|
|
|
@@ -151,10 +151,10 @@ Optional extensions on the jquery.inputmask base
|
|
|
},
|
|
|
'integer': {
|
|
|
regex: {
|
|
|
- number: function (groupSeparator, groupSize, radixPoint, digits, allowPlus, allowMinus) {
|
|
|
- var escapedGroupSeparator = $.inputmask.escapeRegex.call(this, groupSeparator);
|
|
|
- var signedExpression = "[" + (allowPlus ? "\+" : "") + (allowMinus ? "-" : "") + "]?";
|
|
|
- return new RegExp("^" + signedExpression + "(\\d+|\\d{1," + groupSize + "}((" + escapedGroupSeparator + "\\d{" + groupSize + "})?)+)$");
|
|
|
+ number: function (opts) {
|
|
|
+ var escapedGroupSeparator = $.inputmask.escapeRegex.call(this, opts.groupSeparator);
|
|
|
+ var signedExpression = "[" + (opts.allowPlus ? "\+" : "") + (opts.allowMinus ? "-" : "") + "]?";
|
|
|
+ return new RegExp("^" + signedExpression + "(\\d+|\\d{1," + opts.groupSize + "}((" + escapedGroupSeparator + "\\d{" + opts.groupSize + "})?)+)$");
|
|
|
}
|
|
|
},
|
|
|
alias: "decimal"
|