Merge branch 'dev'

jquery.inputmask.extentions.js

@@ -51,72 +51,42 @@ Optional extentions on the jquery.inputmask base
             placeholder: "dd/mm/yyyy",
             regex: {
                 month: new RegExp("((0[1-9]|[12][0-9])\/(0[1-9]|1[012]))|(30\/(0[13-9]|1[012]))|(31\/(0[13578]|1[02]))"),
-                year: new RegExp("(19|20)\\d\\d")
-            },
-            definitions: {
-                'm': { //month
-                    validator: function(chrs, buffer, pos, opts) {
-                        var dayValue = buffer.join('').substr(0, 3);
-                        return opts.regex.month.test(dayValue + chrs);
-                    },
-                    cardinality: 2,
-                    prevalidator: [{ validator: "[01]", cardinality: 1}]
-                },
-                'y': { //year
-                    validator: function(chrs, buffer, pos, opts) {
-                        if (opts.regex.year.test(chrs)) {
-                            var dayMonthValue = buffer.join('').substr(0, 6);
-                            if (dayMonthValue != "29/02/")
-                                return true;
-                            else {
-                                var year = parseInt(chrs);  //detect leap year
-                                if (year % 4 == 0)
-                                    if (year % 100 == 0)
-                                    if (year % 400 == 0)
-                                    return true;
-                                else return false;
-                                else return true;
-                                else return false;
-                            }
-                        } else return false;
-                    },
-                    cardinality: 4,
-                    prevalidator: [
-                        { validator: "[12]", cardinality: 1 },
-                        { validator: "(19|20)", cardinality: 2 },
-                        { validator: "(19|20)\\d", cardinality: 3 }
-                        ]
-                }
-            },
-            insertMode: false,
-            autoUnmask: false
-        },
-        'mm/dd/yyyy': {
-            mask: "m/d/y",
-            placeholder: "mm/dd/yyyy",
-            regex: {
-                day: new RegExp("((0[1-9]|1[012])\/(0[1-9]|[12][0-9]))|((0[13-9]|1[012])\/30)|((0[13578]|1[02])\/31)"),
-                daypre: new RegExp("((0[13-9]|1[012])\/[0-3])|(02\/[0-2])"),
-                year: new RegExp("(19|20)\\d\\d")
+                year: new RegExp("(19|20)\\d\\d"),
+                daypre: new RegExp("[0-3]"),
+                day: new RegExp("0[1-9]|[12][0-9]|3[01]")
             },
             definitions: {
                 'd': { //day
-                    validator: function(chrs, buffer, pos, opts) {
-                        var monthValue = buffer.join('').substr(0, 3);
-                        return opts.regex.day.test(monthValue + chrs);
+                    validator: function(chrs, buffer, pos, strict, opts) {
+                        return opts.regex.day.test(chrs);
                     },
                     cardinality: 2,
-                    prevalidator: [{ validator: function(chrs, buffer, pos, opts) {
-                        var monthValue = buffer.join('').substr(0, 3);
-                        return opts.regex.daypre.test(monthValue + chrs);
+                    prevalidator: [{ validator: function(chrs, buffer, pos, strict, opts) {
+                        var isValid = opts.regex.daypre.test(chrs);
+                        if (!strict && !isValid) {
+                            isValid = opts.regex.day.test("0" + chrs);
+                            if (isValid) {
+                                buffer[pos] = "0";
+                                pos++;
+                                return pos;
+                            }
+                        }
+                        return isValid;
+                    }, cardinality: 1}]
                     },
-                        cardinality: 1}]
+                    'm': { //month
+                        validator: function(chrs, buffer, pos, strict, opts) {
+                            var dayValue = buffer.join('').substr(0, 3);
+                            return opts.regex.month.test(dayValue + chrs);
+                        },
+                        cardinality: 2,
+                        prevalidator: [{ validator: "[01]", cardinality: 1}]
                     },
                     'y': { //year
-                        validator: function(chrs, buffer, pos, opts) {
+                        validator: function(chrs, buffer, pos, strict, opts) {
                             if (opts.regex.year.test(chrs)) {
-                                var monthDayValue = buffer.join('').substr(0, 6);
-                                if (monthDayValue != "02/29/")
+                                var dayMonthValue = buffer.join('').substr(0, 6);
+                                if (dayMonthValue != "29/02/")
                                     return true;
                                 else {
                                     var year = parseInt(chrs);  //detect leap year
@@ -141,134 +111,184 @@ Optional extentions on the jquery.inputmask base
                 insertMode: false,
                 autoUnmask: false
             },
-            'hh:mm:ss': {
-                mask: "h:s:s",
-                autoUnmask: false
-            },
-            'hh:mm': {
-                mask: "h:s",
-                autoUnmask: false
-            },
-            'date': {
-                alias: "dd/mm/yyyy" // "mm/dd/yyyy"
-            },
-            'datetime': {
-                mask: "d/m/y h:s",
-                placeholder: "dd/mm/yyyy hh:mm",
+            'mm/dd/yyyy': {
+                mask: "m/d/y",
+                placeholder: "mm/dd/yyyy",
                 regex: {
-                    month: new RegExp("((0[1-9]|[12][0-9])\/(0[1-9]|1[012]))|(30\/(0[13-9]|1[012]))|(31\/(0[13578]|1[02]))"),
+                    day: new RegExp("((0[1-9]|1[012])\/(0[1-9]|[12][0-9]))|((0[13-9]|1[012])\/30)|((0[13578]|1[02])\/31)"),
+                    daypre: new RegExp("((0[13-9]|1[012])\/[0-3])|(02\/[0-2])"),
                     year: new RegExp("(19|20)\\d\\d")
                 },
                 definitions: {
-                    'm': { //month
-                        validator: function(chrs, buffer, pos, opts) {
-                            var dayValue = buffer.join('').substr(0, 3);
-                            return opts.regex.month.test(dayValue + chrs);
+                    'd': { //day
+                        validator: function(chrs, buffer, pos, strict, opts) {
+                            var monthValue = buffer.join('').substr(0, 3);
+                            return opts.regex.day.test(monthValue + chrs);
                         },
                         cardinality: 2,
-                        prevalidator: [{ validator: "[01]", cardinality: 1}]
-                    },
-                    'y': { //year
-                        validator: function(chrs, buffer, pos, opts) {
-                            if (opts.regex.year.test(chrs)) {
-                                var dayMonthValue = buffer.join('').substr(0, 6);
-                                if (dayMonthValue != "29/02/")
-                                    return true;
-                                else {
-                                    var year = parseInt(chrs);  //detect leap year
-                                    if (year % 4 == 0)
-                                        if (year % 100 == 0)
-                                        if (year % 400 == 0)
-                                        return true;
-                                    else return false;
-                                    else return true;
-                                    else return false;
-                                }
-                            } else return false;
+                        prevalidator: [{ validator: function(chrs, buffer, pos, strict, opts) {
+                            var monthValue = buffer.join('').substr(0, 3);
+                            return opts.regex.daypre.test(monthValue + chrs);
                         },
-                        cardinality: 4,
-                        prevalidator: [
+                            cardinality: 1}]
+                        },
+                        'y': { //year
+                            validator: function(chrs, buffer, pos, strict, opts) {
+                                if (opts.regex.year.test(chrs)) {
+                                    var monthDayValue = buffer.join('').substr(0, 6);
+                                    if (monthDayValue != "02/29/")
+                                        return true;
+                                    else {
+                                        var year = parseInt(chrs);  //detect leap year
+                                        if (year % 4 == 0)
+                                            if (year % 100 == 0)
+                                            if (year % 400 == 0)
+                                            return true;
+                                        else return false;
+                                        else return true;
+                                        else return false;
+                                    }
+                                } else return false;
+                            },
+                            cardinality: 4,
+                            prevalidator: [
                         { validator: "[12]", cardinality: 1 },
                         { validator: "(19|20)", cardinality: 2 },
                         { validator: "(19|20)\\d", cardinality: 3 }
                         ]
-                    }
+                        }
+                    },
+                    insertMode: false,
+                    autoUnmask: false
                 },
-                insertMode: false,
-                autoUnmask: false
-            },
-            //number aliases by Dean (datimson)
-            'decimal': {
-                mask: "~",
-                placeholder: "",
-                repeat: 10,
-                greedy: false,
-                radixPoint: "\.", // | ","
-                regex: {
-                    real: function(radixPoint) { return new RegExp("^([\+\-]?[0-9]*[" + radixPoint + "]?[0-9]*)$"); }
+                'hh:mm:ss': {
+                    mask: "h:s:s",
+                    autoUnmask: false
                 },
-                definitions: {
-                    '~': { //real number
-                        validator: function(chrs, buffer, pos, opts) {
-                            var myBuffer = buffer.slice();
-                            myBuffer.splice(pos, 0, chrs);
-                            var test = myBuffer.join('');
-                            var isValid = opts.regex.real(opts.radixPoint).test(test);
-                            return isValid;
-                        },
-                        cardinality: 1,
-                        prevalidator: null
-                    }
+                'hh:mm': {
+                    mask: "h:s",
+                    autoUnmask: false
                 },
-                insertMode: true
-            },
-            'non-negative-decimal': {
-                mask: "~",
-                placeholder: "",
-                repeat: 10,
-                greedy: false,
-                radixPoint: "\.", // | ","
-                regex: {
-                    decimal: function(radixPoint) { return new RegExp("^([0-9]+[" + radixPoint + "]?[0-9]*)$"); }
+                'date': {
+                    alias: "dd/mm/yyyy" // "mm/dd/yyyy"
                 },
-                definitions: {
-                    '~': {
-                        validator: function(chrs, buffer, pos, opts) {
-                            var myBuffer = buffer.slice();
-                            myBuffer.splice(pos, 0, chrs);
-                            var test = myBuffer.join('');
-                            var isValid = opts.regex.decimal(opts.radixPoint).test(test);
-                            return isValid;
+                'datetime': {
+                    mask: "d/m/y h:s",
+                    placeholder: "dd/mm/yyyy hh:mm",
+                    regex: {
+                        month: new RegExp("((0[1-9]|[12][0-9])\/(0[1-9]|1[012]))|(30\/(0[13-9]|1[012]))|(31\/(0[13578]|1[02]))"),
+                        year: new RegExp("(19|20)\\d\\d")
+                    },
+                    definitions: {
+                        'm': { //month
+                            validator: function(chrs, buffer, pos, strict, opts) {
+                                var dayValue = buffer.join('').substr(0, 3);
+                                return opts.regex.month.test(dayValue + chrs);
+                            },
+                            cardinality: 2,
+                            prevalidator: [{ validator: "[01]", cardinality: 1}]
                         },
-                        cardinality: 1,
-                        prevalidator: null
-                    }
+                        'y': { //year
+                            validator: function(chrs, buffer, pos, strict, opts) {
+                                if (opts.regex.year.test(chrs)) {
+                                    var dayMonthValue = buffer.join('').substr(0, 6);
+                                    if (dayMonthValue != "29/02/")
+                                        return true;
+                                    else {
+                                        var year = parseInt(chrs);  //detect leap year
+                                        if (year % 4 == 0)
+                                            if (year % 100 == 0)
+                                            if (year % 400 == 0)
+                                            return true;
+                                        else return false;
+                                        else return true;
+                                        else return false;
+                                    }
+                                } else return false;
+                            },
+                            cardinality: 4,
+                            prevalidator: [
+                        { validator: "[12]", cardinality: 1 },
+                        { validator: "(19|20)", cardinality: 2 },
+                        { validator: "(19|20)\\d", cardinality: 3 }
+                        ]
+                        }
+                    },
+                    insertMode: false,
+                    autoUnmask: false
                 },
-                insertMode: true
-            },
-            'integer': {
-                mask: "~",
-                placeholder: "",
-                repeat: 10,
-                greedy: false,
-                numericInput: true,
-                regex: {
-                    integer: new RegExp("^([\+\-]?[0-9]*)$")
+                //number aliases by Dean (datimson)
+                'decimal': {
+                    mask: "~",
+                    placeholder: "",
+                    repeat: 10,
+                    greedy: false,
+                    radixPoint: "\.", // | ","
+                    regex: {
+                        real: function(radixPoint) { return new RegExp("^([\+\-]?[0-9]*[" + radixPoint + "]?[0-9]*)$"); }
+                    },
+                    definitions: {
+                        '~': { //real number
+                            validator: function(chrs, buffer, pos, strict, opts) {
+                                var myBuffer = buffer.slice();
+                                myBuffer.splice(pos, 0, chrs);
+                                var test = myBuffer.join('');
+                                var isValid = opts.regex.real(opts.radixPoint).test(test);
+                                return isValid;
+                            },
+                            cardinality: 1,
+                            prevalidator: null
+                        }
+                    },
+                    insertMode: true
                 },
-                definitions: {
-                    '~': {
-                        validator: function(chrs, buffer, pos, opts) {
-                            var myBuffer = buffer.slice();
-                            myBuffer.splice(pos, 0, chrs);
-                            var test = myBuffer.join('');
-                            var isValid = opts.regex.integer.test(test);
-                            return isValid;
-                        },
-                        cardinality: 1,
-                        prevalidator: null
-                    }
+                'non-negative-decimal': {
+                    mask: "~",
+                    placeholder: "",
+                    repeat: 10,
+                    greedy: false,
+                    radixPoint: "\.", // | ","
+                    regex: {
+                        decimal: function(radixPoint) { return new RegExp("^([0-9]+[" + radixPoint + "]?[0-9]*)$"); }
+                    },
+                    definitions: {
+                        '~': {
+                            validator: function(chrs, buffer, pos, strict, opts) {
+                                var myBuffer = buffer.slice();
+                                myBuffer.splice(pos, 0, chrs);
+                                var test = myBuffer.join('');
+                                var isValid = opts.regex.decimal(opts.radixPoint).test(test);
+                                return isValid;
+                            },
+                            cardinality: 1,
+                            prevalidator: null
+                        }
+                    },
+                    insertMode: true
                 },
-                insertMode: true
-            }
-        });
-    })(jQuery);
+                'integer': {
+                    mask: "~",
+                    placeholder: "",
+                    repeat: 10,
+                    greedy: false,
+                    numericInput: true,
+                    regex: {
+                        integer: new RegExp("^([\+\-]?[0-9]*)$")
+                    },
+                    definitions: {
+                        '~': {
+                            validator: function(chrs, buffer, pos, strict, opts) {
+                                var myBuffer = buffer.slice();
+                                myBuffer.splice(pos, 0, chrs);
+                                var test = myBuffer.join('');
+                                var isValid = opts.regex.integer.test(test);
+                                return isValid;
+                            },
+                            cardinality: 1,
+                            prevalidator: null
+                        }
+                    },
+                    insertMode: true
+                }
+            });
+        })(jQuery);

jquery.inputmask.js

@@ -3,7 +3,7 @@ Input Mask plugin for jquery
 http://github.com/RobinHerbots/jquery.inputmask
 Copyright (c) 2010 Robin Herbots
 Licensed under the MIT license (http://www.opensource.org/licenses/mit-license.php)
-Version: 0.5.5
+Version: 0.5.6
  
 This plugin is based on the masked input plugin written by Josh Bush (digitalbush.com)
 */
@@ -231,7 +231,7 @@ This plugin is based on the masked input plugin written by Josh Bush (digitalbus
                 });
             }
 
-            function isValid(pos, c, buffer) {
+            function isValid(pos, c, buffer, strict) { //strict true ~ no correction or autofill
                 if (pos < 0 || pos >= getMaskLength()) return false;
                 var testPos = determineTestPosition(pos), loopend = c ? 1 : 0, chrs = '';
                 for (var i = tests[testPos].cardinality; i > loopend; i--) {
@@ -239,7 +239,7 @@ This plugin is based on the masked input plugin written by Josh Bush (digitalbus
                 }
 
                 if (c) { chrs += c; }
-                return tests[testPos].fn != null ? tests[testPos].fn.test(chrs, buffer, pos, opts) : false;
+                return tests[testPos].fn != null ? tests[testPos].fn.test(chrs, buffer, pos, strict, opts) : false;
             }
 
             function isMask(pos) {
@@ -354,12 +354,13 @@ This plugin is based on the masked input plugin written by Josh Bush (digitalbus
                 }
                 clearBuffer(buffer, 0, buffer.length);
                 buffer.length = _buffer.length;
-                var lastMatch = -1, checkPosition = -1, maskL = getMaskLength(), ivl = inputValue.length, rtlMatch = ivl == 0 ? maskL : -1;
+                var lastMatch = -1, checkPosition = -1, np, maskL = getMaskLength(), ivl = inputValue.length, rtlMatch = ivl == 0 ? maskL : -1;
                 for (var i = 0; i < ivl; i++) {
                     for (var pos = checkPosition + 1; pos < maskL; pos++) {
                         if (isMask(pos)) {
                             var c = inputValue[i];
-                            if (isValid(pos, c, buffer) !== false) {
+                            if ((np = isValid(pos, c, buffer, !clearInvalid)) !== false) {
+                                if (np !== true) pos = np; //set new position from isValid
                                 setBufferElement(buffer, pos, c);
                                 lastMatch = checkPosition = pos;
                             } else {
@@ -567,9 +568,9 @@ This plugin is based on the masked input plugin written by Josh Bush (digitalbus
                                 var clickPosition = selectedCaret.begin;
                                 lastPosition = checkVal(input, buffer, false);
                                 if (isRTL)
-                                    caret(input, clickPosition > lastPosition && (isValid(clickPosition, buffer[clickPosition], buffer) || !isMask(clickPosition)) ? clickPosition : lastPosition);
+                                    caret(input, clickPosition > lastPosition && (isValid(clickPosition, buffer[clickPosition], buffer, true) !== false || !isMask(clickPosition)) ? clickPosition : lastPosition);
                                 else
-                                    caret(input, clickPosition < lastPosition && (isValid(clickPosition, buffer[clickPosition], buffer) || !isMask(clickPosition)) ? clickPosition : lastPosition);
+                                    caret(input, clickPosition < lastPosition && (isValid(clickPosition, buffer[clickPosition], buffer, true) !== false || !isMask(clickPosition)) ? clickPosition : lastPosition);
                             }
                         }, 0);
                     }).bind('dblclick.inputmask', function() {
@@ -684,7 +685,7 @@ This plugin is based on the masked input plugin written by Josh Bush (digitalbus
                             var j = seekNext(buffer, i);
                             var p = getBufferElement(buffer, j);
                             if (p != getPlaceHolder(j)) {
-                                if (j < getMaskLength() && isValid(i, p, buffer) !== false && tests[determineTestPosition(i)].def == tests[determineTestPosition(j)].def) {
+                                if (j < getMaskLength() && isValid(i, p, buffer, true) !== false && tests[determineTestPosition(i)].def == tests[determineTestPosition(j)].def) {
                                     setBufferElement(buffer, i, getBufferElement(buffer, j));
                                 } else {
                                     if (isMask(i))
@@ -711,7 +712,7 @@ This plugin is based on the masked input plugin written by Josh Bush (digitalbus
                             if (t != getPlaceHolder(i)) {
                                 var j = seekNext(buffer, i);
                                 if (j < getMaskLength()) {
-                                    if (isValid(j, t, buffer) !== false && tests[determineTestPosition(i)].def == tests[determineTestPosition(j)].def)
+                                    if (isValid(j, t, buffer, true) !== false && tests[determineTestPosition(i)].def == tests[determineTestPosition(j)].def)
                                         c = t;
                                     else {
                                         if (isMask(j))
@@ -817,9 +818,10 @@ This plugin is based on the masked input plugin written by Josh Bush (digitalbus
                         if (k) {
                             var pos = caret(input), c = String.fromCharCode(k), maskL = getMaskLength();
                             if (isRTL) {
-                                var p = seekPrevious(buffer, pos.end);
-                                if (isValid(p, c, buffer)) {
-                                    if (isValid(firstMaskPos, buffer[firstMaskPos], buffer) == false || (opts.greedy === false && buffer.length < maskL)) {
+                                var p = seekPrevious(buffer, pos.end), np;
+                                if ((np = isValid(p, c, buffer, false)) !== false) {
+                                    if (np !== true) p = np; //set new position from isValid
+                                    if (isValid(firstMaskPos, buffer[firstMaskPos], buffer, true) == false || (opts.greedy === false && buffer.length < maskL)) {
                                         if (buffer[firstMaskPos] != getPlaceHolder(firstMaskPos) && buffer.length < maskL) {
                                             var offset = prepareBuffer(buffer, -1, isRTL) + 1;
                                             p = p + offset;
@@ -832,9 +834,10 @@ This plugin is based on the masked input plugin written by Josh Bush (digitalbus
                                 } else if (android) writeBuffer(input, buffer, pos.begin);
                             }
                             else {
-                                var p = seekNext(buffer, pos.begin - 1);
+                                var p = seekNext(buffer, pos.begin - 1), np;
                                 prepareBuffer(buffer, p, isRTL);
-                                if (isValid(p, c, buffer)) {
+                                if ((np = isValid(p, c, buffer, false)) !== false) {
+                                    if (np !== true) p = np; //set new position from isValid
                                     if (opts.insertMode == true) shiftR(p, maskL, c); else setBufferElement(buffer, p, c);
                                     var next = seekNext(buffer, p);
                                     writeBuffer(input, buffer, next);