Browse Source

simplify +- in numerics

Robin Herbots 11 years ago
parent
commit
672167ecb9

+ 2 - 6
dist/inputmask/jquery.inputmask.numeric.extensions.js

@@ -170,12 +170,8 @@
                 "+": {
                     validator: function(chrs, maskset, pos, strict, opts) {
                         var isValid = opts.signHandler(chrs, maskset.buffer, pos, strict, opts);
-                        if (!isValid) {
-                            var signed = "[";
-                            opts.allowMinus === !0 && (signed += "-"), opts.allowPlus === !0 && (signed += "+"), 
-                            signed += "]", isValid = new RegExp(signed).test(chrs);
-                        }
-                        return isValid;
+                        return isValid || (isValid = opts.allowMinus && "-" == chrs || opts.allowPlus && "+" == chrs), 
+                        isValid;
                     },
                     cardinality: 1,
                     prevalidator: null,

+ 2 - 6
dist/jquery.inputmask.bundle.js

@@ -1890,12 +1890,8 @@
                 "+": {
                     validator: function(chrs, maskset, pos, strict, opts) {
                         var isValid = opts.signHandler(chrs, maskset.buffer, pos, strict, opts);
-                        if (!isValid) {
-                            var signed = "[";
-                            opts.allowMinus === !0 && (signed += "-"), opts.allowPlus === !0 && (signed += "+"), 
-                            signed += "]", isValid = new RegExp(signed).test(chrs);
-                        }
-                        return isValid;
+                        return isValid || (isValid = opts.allowMinus && "-" == chrs || opts.allowPlus && "+" == chrs), 
+                        isValid;
                     },
                     cardinality: 1,
                     prevalidator: null,

File diff suppressed because it is too large
+ 1 - 1
dist/jquery.inputmask.bundle.min.js


+ 1 - 5
js/jquery.inputmask.numeric.extensions.js

@@ -205,11 +205,7 @@ Optional extensions on the jquery.inputmask base
                     validator: function (chrs, maskset, pos, strict, opts) {
                         var isValid = opts.signHandler(chrs, maskset.buffer, pos, strict, opts);
                         if (!isValid) {
-                            var signed = "[";
-                            if (opts.allowMinus === true) signed += "-";
-                            if (opts.allowPlus === true) signed += "\+";
-                            signed += "]";
-                            isValid = new RegExp(signed).test(chrs);
+                            isValid = (opts.allowMinus && chrs == "-") || (opts.allowPlus && chrs == "+");
                         }
                         return isValid;
                     },