ソースを参照

fix decimal alias (copy from 2.x branch)

Robin Herbots 12 年 前
コミット
a5741232e5

BIN
dist/jQuery.InputMask.1.3.7.nupkg


+ 394 - 383
dist/jquery.inputmask.bundle.js

@@ -536,7 +536,7 @@
             }
 
             function caret(input, begin, end) {
-				if (!$(input).is(':visible')) {
+                if (!$(input).is(':visible')) {
                     return;
                 }
                 var npt = input.jquery && input.length > 0 ? input[0] : input;
@@ -970,7 +970,7 @@
                         }
                     }
 
-                    opts.onKeyDown.call(this, e, opts); //extra stuff to execute on keydown
+                    opts.onKeyDown.call(this, e, buffer, opts); //extra stuff to execute on keydown
                     ignorable = $.inArray(k, opts.ignorables) != -1;
                 }
 
@@ -1073,7 +1073,7 @@
                 function keyupEvent(e) {
                     var $input = $(this), input = this;
                     var k = e.keyCode;
-                    opts.onKeyUp.call(this, e, opts); //extra stuff to execute on keyup
+                    opts.onKeyUp.call(this, e, buffer, opts); //extra stuff to execute on keyup
                     if (k == opts.keyCode.TAB && $input.hasClass('focus.inputmask') && input._valueGet().length == 0 && opts.showMaskOnFocus) {
                         buffer = _buffer.slice();
                         writeBuffer(input, buffer);
@@ -1193,28 +1193,28 @@ Version: 1.3.7
 
 Optional extensions on the jquery.inputmask base
 */
-(function($) {
+(function ($) {
     //date & time aliases
     $.extend($.inputmask.defaults.definitions, {
         'h': { //hours
             validator: "[01][0-9]|2[0-3]",
             cardinality: 2,
-            prevalidator: [{ validator: "[0-2]", cardinality: 1}]
+            prevalidator: [{ validator: "[0-2]", cardinality: 1 }]
         },
         's': { //seconds || minutes
             validator: "[0-5][0-9]",
             cardinality: 2,
-            prevalidator: [{ validator: "[0-5]", cardinality: 1}]
+            prevalidator: [{ validator: "[0-5]", cardinality: 1 }]
         },
         'd': { //basic day
             validator: "0[1-9]|[12][0-9]|3[01]",
             cardinality: 2,
-            prevalidator: [{ validator: "[0-3]", cardinality: 1}]
+            prevalidator: [{ validator: "[0-3]", cardinality: 1 }]
         },
         'm': { //basic month
             validator: "0[1-9]|1[012]",
             cardinality: 2,
-            prevalidator: [{ validator: "[01]", cardinality: 1}]
+            prevalidator: [{ validator: "[01]", cardinality: 1 }]
         },
         'y': { //basic year
             validator: "(19|20)\\d{2}",
@@ -1223,7 +1223,7 @@ Optional extensions on the jquery.inputmask base
                         { validator: "[12]", cardinality: 1 },
                         { validator: "(19|20)", cardinality: 2 },
                         { validator: "(19|20)\\d", cardinality: 3 }
-                        ]
+            ]
         }
     });
     $.extend($.inputmask.defaults.aliases, {
@@ -1233,27 +1233,27 @@ Optional extensions on the jquery.inputmask base
             regex: {
                 val1pre: new RegExp("[0-3]"), //daypre
                 val1: new RegExp("0[1-9]|[12][0-9]|3[01]"), //day
-                val2pre: function(separator) { var escapedSeparator = $.inputmask.escapeRegex.call(this, separator); return new RegExp("((0[1-9]|[12][0-9]|3[01])" + escapedSeparator + "[01])"); }, //monthpre
-                val2: function(separator) { var escapedSeparator = $.inputmask.escapeRegex.call(this, separator); return new RegExp("((0[1-9]|[12][0-9])" + escapedSeparator + "(0[1-9]|1[012]))|(30" + escapedSeparator + "(0[13-9]|1[012]))|(31" + escapedSeparator + "(0[13578]|1[02]))"); }//month
+                val2pre: function (separator) { var escapedSeparator = $.inputmask.escapeRegex.call(this, separator); return new RegExp("((0[1-9]|[12][0-9]|3[01])" + escapedSeparator + "[01])"); }, //monthpre
+                val2: function (separator) { var escapedSeparator = $.inputmask.escapeRegex.call(this, separator); return new RegExp("((0[1-9]|[12][0-9])" + escapedSeparator + "(0[1-9]|1[012]))|(30" + escapedSeparator + "(0[13-9]|1[012]))|(31" + escapedSeparator + "(0[13578]|1[02]))"); }//month
             },
             leapday: "29/02/",
             separator: '/',
             yearrange: { minyear: 1900, maxyear: 2099 },
-            isInYearRange: function(chrs, minyear, maxyear){
-            	var enteredyear = parseInt(chrs.concat(minyear.toString().slice(chrs.length)));
-            	var enteredyear2 = parseInt(chrs.concat(maxyear.toString().slice(chrs.length)));
-            	return (enteredyear != NaN ? minyear <= enteredyear && enteredyear <= maxyear : false) ||
-            		   (enteredyear2 != NaN ? minyear <= enteredyear2 && enteredyear2 <= maxyear : false); 
+            isInYearRange: function (chrs, minyear, maxyear) {
+                var enteredyear = parseInt(chrs.concat(minyear.toString().slice(chrs.length)));
+                var enteredyear2 = parseInt(chrs.concat(maxyear.toString().slice(chrs.length)));
+                return (enteredyear != NaN ? minyear <= enteredyear && enteredyear <= maxyear : false) ||
+            		   (enteredyear2 != NaN ? minyear <= enteredyear2 && enteredyear2 <= maxyear : false);
             },
-            determinebaseyear: function(minyear, maxyear){
-            	var currentyear = (new Date()).getFullYear();
-            	if(minyear > currentyear) return minyear;
-            	if(maxyear < currentyear) return maxyear;
-            	
-            	return currentyear;
+            determinebaseyear: function (minyear, maxyear) {
+                var currentyear = (new Date()).getFullYear();
+                if (minyear > currentyear) return minyear;
+                if (maxyear < currentyear) return maxyear;
+
+                return currentyear;
             },
-            onKeyUp: function(e, opts) {
-                var $input = $(this), input = this;
+            onKeyUp: function (e, buffer, opts) {
+                var $input = $(this);
                 if (e.ctrlKey && e.keyCode == opts.keyCode.RIGHT) {
                     var today = new Date();
                     $input.val(today.getDate().toString() + (today.getMonth() + 1).toString() + today.getFullYear().toString());
@@ -1261,50 +1261,53 @@ Optional extensions on the jquery.inputmask base
             },
             definitions: {
                 '1': { //val1 ~ day or month
-                    validator: function(chrs, buffer, pos, strict, opts) {
+                    validator: function (chrs, buffer, pos, strict, opts) {
                         var isValid = opts.regex.val1.test(chrs);
                         if (!strict && !isValid) {
-                            if (chrs.charAt(1) == opts.separator || "-./".indexOf(chrs.charAt(1)) != -1 ) {
+                            if (chrs.charAt(1) == opts.separator || "-./".indexOf(chrs.charAt(1)) != -1) {
                                 isValid = opts.regex.val1.test("0" + chrs.charAt(0));
                                 if (isValid) {
                                     buffer[pos - 1] = "0";
-                                    return { "pos": pos ,"c": chrs.charAt(0) };
+                                    return { "pos": pos, "c": chrs.charAt(0) };
                                 }
                             }
                         }
                         return isValid;
                     },
                     cardinality: 2,
-                    prevalidator: [{ validator: function(chrs, buffer, pos, strict, opts) {
-                        var isValid = opts.regex.val1pre.test(chrs);
+                    prevalidator: [{
+                        validator: function (chrs, buffer, pos, strict, opts) {
+                            var isValid = opts.regex.val1pre.test(chrs);
+                            if (!strict && !isValid) {
+                                isValid = opts.regex.val1.test("0" + chrs);
+                                if (isValid) {
+                                    buffer[pos] = "0";
+                                    pos++;
+                                    return { "pos": pos };
+                                }
+                            }
+                            return isValid;
+                        }, cardinality: 1
+                    }]
+                },
+                '2': { //val2 ~ day or month
+                    validator: function (chrs, buffer, pos, strict, opts) {
+                        var frontValue = buffer.join('').substr(0, 3);
+                        var isValid = opts.regex.val2(opts.separator).test(frontValue + chrs);
                         if (!strict && !isValid) {
-                            isValid = opts.regex.val1.test("0" + chrs);
-                            if (isValid) {
-                                buffer[pos] = "0";
-                                pos++;
-                                return { "pos": pos };
+                            if (chrs.charAt(1) == opts.separator || "-./".indexOf(chrs.charAt(1)) != -1) {
+                                isValid = opts.regex.val2(opts.separator).test(frontValue + "0" + chrs.charAt(0));
+                                if (isValid) {
+                                    buffer[pos - 1] = "0";
+                                    return { "pos": pos, "c": chrs.charAt(0) };
+                                }
                             }
                         }
                         return isValid;
-                    }, cardinality: 1}]
                     },
-                    '2': { //val2 ~ day or month
-                        validator: function(chrs, buffer, pos, strict, opts) {
-                            var frontValue = buffer.join('').substr(0, 3);
-                            var isValid = opts.regex.val2(opts.separator).test(frontValue + chrs);
-                            if (!strict && !isValid) {
-                                if (chrs.charAt(1) == opts.separator || "-./".indexOf(chrs.charAt(1)) != -1 ) {
-                                    isValid = opts.regex.val2(opts.separator).test(frontValue + "0" + chrs.charAt(0));
-                                    if (isValid) {
-                                        buffer[pos - 1] = "0";
-                                        return { "pos": pos, "c": chrs.charAt(0) };
-                                    }
-                                }
-                            }
-                            return isValid;
-                        },
-                        cardinality: 2,
-                        prevalidator: [{ validator: function(chrs, buffer, pos, strict, opts) {
+                    cardinality: 2,
+                    prevalidator: [{
+                        validator: function (chrs, buffer, pos, strict, opts) {
                             var frontValue = buffer.join('').substr(0, 3);
                             var isValid = opts.regex.val2pre(opts.separator).test(frontValue + chrs);
                             if (!strict && !isValid) {
@@ -1316,353 +1319,365 @@ Optional extensions on the jquery.inputmask base
                                 }
                             }
                             return isValid;
-                        }, cardinality: 1}]
-                        },
-                        'y': { //year
-                            validator: function(chrs, buffer, pos, strict, opts) {
-                                if (opts.isInYearRange(chrs, opts.yearrange.minyear, opts.yearrange.maxyear)) {
-                                    var dayMonthValue = buffer.join('').substr(0, 6);
-                                    if (dayMonthValue != opts.leapday)
-                                        return true;
-                                    else {
-                                        var year = parseInt(chrs,10);//detect leap year
-                                        if (year % 4 === 0)
-                                            if (year % 100 === 0)
-                                            if (year % 400 === 0)
+                        }, cardinality: 1
+                    }]
+                },
+                'y': { //year
+                    validator: function (chrs, buffer, pos, strict, opts) {
+                        if (opts.isInYearRange(chrs, opts.yearrange.minyear, opts.yearrange.maxyear)) {
+                            var dayMonthValue = buffer.join('').substr(0, 6);
+                            if (dayMonthValue != opts.leapday)
+                                return true;
+                            else {
+                                var year = parseInt(chrs, 10);//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: function(chrs, buffer, pos, strict, opts) {
-                            var isValid = opts.isInYearRange(chrs, opts.yearrange.minyear, opts.yearrange.maxyear);
-                            if (!strict && !isValid) {
-                                var yearPrefix = opts.determinebaseyear(opts.yearrange.minyear, opts.yearrange.maxyear).toString().slice(0, 1);
+                                    else return true;
+                                else return false;
+                            }
+                        } else return false;
+                    },
+                    cardinality: 4,
+                    prevalidator: [
+                {
+                    validator: function (chrs, buffer, pos, strict, opts) {
+                        var isValid = opts.isInYearRange(chrs, opts.yearrange.minyear, opts.yearrange.maxyear);
+                        if (!strict && !isValid) {
+                            var yearPrefix = opts.determinebaseyear(opts.yearrange.minyear, opts.yearrange.maxyear).toString().slice(0, 1);
 
-                                isValid = opts.isInYearRange(yearPrefix + chrs, opts.yearrange.minyear, opts.yearrange.maxyear);
+                            isValid = opts.isInYearRange(yearPrefix + chrs, opts.yearrange.minyear, opts.yearrange.maxyear);
+                            if (isValid) {
+                                buffer[pos++] = yearPrefix[0];
+                                return { "pos": pos };
+                            }
+                            yearPrefix = opts.determinebaseyear(opts.yearrange.minyear, opts.yearrange.maxyear).toString().slice(0, 2);
+
+                            isValid = opts.isInYearRange(yearPrefix + chrs, opts.yearrange.minyear, opts.yearrange.maxyear);
+                            if (isValid) {
+                                buffer[pos++] = yearPrefix[0];
+                                buffer[pos++] = yearPrefix[1];
+                                return { "pos": pos };
+                            }
+                        }
+                        return isValid;
+                    },
+                    cardinality: 1
+                },
+                {
+                    validator: function (chrs, buffer, pos, strict, opts) {
+                        var isValid = opts.isInYearRange(chrs, opts.yearrange.minyear, opts.yearrange.maxyear);
+                        if (!strict && !isValid) {
+                            var yearPrefix = opts.determinebaseyear(opts.yearrange.minyear, opts.yearrange.maxyear).toString().slice(0, 2);
+
+                            isValid = opts.isInYearRange(yearPrefix + chrs[1], opts.yearrange.minyear, opts.yearrange.maxyear);
+                            if (isValid) {
+                                buffer[pos++] = yearPrefix[1];
+                                return { "pos": pos };
+                            }
+
+                            yearPrefix = opts.determinebaseyear(opts.yearrange.minyear, opts.yearrange.maxyear).toString().slice(0, 2);
+                            if (opts.isInYearRange(yearPrefix + chrs, opts.yearrange.minyear, opts.yearrange.maxyear)) {
+                                var dayMonthValue = buffer.join('').substr(0, 6);
+                                if (dayMonthValue != opts.leapday)
+                                    isValid = true;
+                                else {
+                                    var year = parseInt(chrs, 10);//detect leap year
+                                    if (year % 4 === 0)
+                                        if (year % 100 === 0)
+                                            if (year % 400 === 0)
+                                                isValid = true;
+                                            else isValid = false;
+                                        else isValid = true;
+                                    else isValid = false;
+                                }
+                            } else isValid = false;
+                            if (isValid) {
+                                buffer[pos - 1] = yearPrefix[0];
+                                buffer[pos++] = yearPrefix[1];
+                                buffer[pos++] = chrs[0];
+                                return { "pos": pos };
+                            }
+                        }
+                        return isValid;
+                    }, cardinality: 2
+                },
+                {
+                    validator: function (chrs, buffer, pos, strict, opts) {
+                        return opts.isInYearRange(chrs, opts.yearrange.minyear, opts.yearrange.maxyear);
+                    }, cardinality: 3
+                }
+                    ]
+                }
+            },
+            insertMode: false,
+            autoUnmask: false
+        },
+        'mm/dd/yyyy': {
+            placeholder: "mm/dd/yyyy",
+            alias: "dd/mm/yyyy", //reuse functionality of dd/mm/yyyy alias
+            regex: {
+                val2pre: function (separator) { var escapedSeparator = $.inputmask.escapeRegex.call(this, separator); return new RegExp("((0[13-9]|1[012])" + escapedSeparator + "[0-3])|(02" + escapedSeparator + "[0-2])"); }, //daypre
+                val2: function (separator) { var escapedSeparator = $.inputmask.escapeRegex.call(this, separator); return new RegExp("((0[1-9]|1[012])" + escapedSeparator + "(0[1-9]|[12][0-9]))|((0[13-9]|1[012])" + escapedSeparator + "30)|((0[13578]|1[02])" + escapedSeparator + "31)"); }, //day
+                val1pre: new RegExp("[01]"), //monthpre
+                val1: new RegExp("0[1-9]|1[012]") //month
+            },
+            leapday: "02/29/",
+            onKeyUp: function (e, buffer, opts) {
+                var $input = $(this);
+                if (e.ctrlKey && e.keyCode == opts.keyCode.RIGHT) {
+                    var today = new Date();
+                    $input.val((today.getMonth() + 1).toString() + today.getDate().toString() + today.getFullYear().toString());
+                }
+            }
+        },
+        'yyyy/mm/dd': {
+            mask: "y/1/2",
+            placeholder: "yyyy/mm/dd",
+            alias: "mm/dd/yyyy",
+            leapday: "/02/29",
+            onKeyUp: function (e, buffer, opts) {
+                var $input = $(this);
+                if (e.ctrlKey && e.keyCode == opts.keyCode.RIGHT) {
+                    var today = new Date();
+                    $input.val(today.getFullYear().toString() + (today.getMonth() + 1).toString() + today.getDate().toString());
+                }
+            },
+            definitions: {
+                '2': { //val2 ~ day or month
+                    validator: function (chrs, buffer, pos, strict, opts) {
+                        var frontValue = buffer.join('').substr(5, 3);
+                        var isValid = opts.regex.val2(opts.separator).test(frontValue + chrs);
+                        if (!strict && !isValid) {
+                            if (chrs.charAt(1) == opts.separator || "-./".indexOf(chrs.charAt(1)) != -1) {
+                                isValid = opts.regex.val2(opts.separator).test(frontValue + "0" + chrs.charAt(0));
                                 if (isValid) {
-                                    buffer[pos++] = yearPrefix[0];
-                                    return { "pos": pos };
+                                    buffer[pos - 1] = "0";
+                                    return { "pos": pos, "c": chrs.charAt(0) };
                                 }
-                                yearPrefix = opts.determinebaseyear(opts.yearrange.minyear, opts.yearrange.maxyear).toString().slice(0, 2);
+                            }
+                        }
+
+                        //check leap yeap
+                        if (isValid) {
+                            var dayMonthValue = buffer.join('').substr(4, 4) + chrs;
+                            if (dayMonthValue != opts.leapday)
+                                return true;
+                            else {
+                                var year = parseInt(buffer.join('').substr(0, 4), 10);  //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;
+                            }
+                        }
 
-                                isValid = opts.isInYearRange(yearPrefix + chrs, opts.yearrange.minyear, opts.yearrange.maxyear);
+                        return isValid;
+                    },
+                    cardinality: 2,
+                    prevalidator: [{
+                        validator: function (chrs, buffer, pos, strict, opts) {
+                            var frontValue = buffer.join('').substr(5, 3);
+                            var isValid = opts.regex.val2pre(opts.separator).test(frontValue + chrs);
+                            if (!strict && !isValid) {
+                                isValid = opts.regex.val2(opts.separator).test(frontValue + "0" + chrs);
                                 if (isValid) {
-                                    buffer[pos++] = yearPrefix[0];
-                                    buffer[pos++] = yearPrefix[1];
+                                    buffer[pos] = "0";
+                                    pos++;
                                     return { "pos": pos };
                                 }
                             }
                             return isValid;
-                        },
-                            cardinality: 1
-                        },
-                        { validator: function(chrs, buffer, pos, strict, opts) {
-                            var isValid = opts.isInYearRange(chrs, opts.yearrange.minyear, opts.yearrange.maxyear);
-                            if (!strict && !isValid) {
-                                var yearPrefix = opts.determinebaseyear(opts.yearrange.minyear, opts.yearrange.maxyear).toString().slice(0, 2);
-
-                                isValid = opts.isInYearRange(yearPrefix + chrs[1], opts.yearrange.minyear, opts.yearrange.maxyear);
+                        }, cardinality: 1
+                    }]
+                }
+            }
+        },
+        'dd.mm.yyyy': {
+            mask: "1.2.y",
+            placeholder: "dd.mm.yyyy",
+            leapday: "29.02.",
+            separator: '.',
+            alias: "dd/mm/yyyy"
+        },
+        'dd-mm-yyyy': {
+            mask: "1-2-y",
+            placeholder: "dd-mm-yyyy",
+            leapday: "29-02-",
+            separator: '-',
+            alias: "dd/mm/yyyy"
+        },
+        'mm.dd.yyyy': {
+            mask: "1.2.y",
+            placeholder: "mm.dd.yyyy",
+            leapday: "02.29.",
+            separator: '.',
+            alias: "mm/dd/yyyy"
+        },
+        'mm-dd-yyyy': {
+            mask: "1-2-y",
+            placeholder: "mm-dd-yyyy",
+            leapday: "02-29-",
+            separator: '-',
+            alias: "mm/dd/yyyy"
+        },
+        'yyyy.mm.dd': {
+            mask: "y.1.2",
+            placeholder: "yyyy.mm.dd",
+            leapday: ".02.29",
+            separator: '.',
+            alias: "yyyy/mm/dd"
+        },
+        'yyyy-mm-dd': {
+            mask: "y-1-2",
+            placeholder: "yyyy-mm-dd",
+            leapday: "-02-29",
+            separator: '-',
+            alias: "yyyy/mm/dd"
+        },
+        'datetime': {
+            mask: "1/2/y h:s",
+            placeholder: "dd/mm/yyyy hh:mm",
+            alias: "dd/mm/yyyy",
+            regex: {
+                hrspre: new RegExp("[012]"), //hours pre
+                hrs24: new RegExp("2[0-9]|1[3-9]"),
+                hrs: new RegExp("[01][0-9]|2[0-3]"), //hours
+                ampmpre: new RegExp("[apAP]"),
+                ampm: new RegExp("^[a|p|A|P][m|M]")
+            },
+            timeseparator: ':',
+            hourFormat: "24", // or 12
+            definitions: {
+                'h': { //hours
+                    validator: function (chrs, buffer, pos, strict, opts) {
+                        var isValid = opts.regex.hrs.test(chrs);
+                        if (!strict && !isValid) {
+                            if (chrs.charAt(1) == opts.timeseparator || "-.:".indexOf(chrs.charAt(1)) != -1) {
+                                isValid = opts.regex.hrs.test("0" + chrs.charAt(0));
                                 if (isValid) {
-                                    buffer[pos++] = yearPrefix[1];
+                                    buffer[pos - 1] = "0";
+                                    buffer[pos] = chrs.charAt(0);
+                                    pos++;
                                     return { "pos": pos };
                                 }
-                            
-                                yearPrefix = opts.determinebaseyear(opts.yearrange.minyear, opts.yearrange.maxyear).toString().slice(0, 2);
-                                if (opts.isInYearRange(yearPrefix + chrs, opts.yearrange.minyear, opts.yearrange.maxyear)) {
-                                    var dayMonthValue = buffer.join('').substr(0, 6);
-                                    if (dayMonthValue != opts.leapday)
-                                        isValid = true;
-                                    else {
-                                        var year = parseInt(chrs,10);//detect leap year
-                                        if (year % 4 === 0)
-                                            if (year % 100 === 0)
-                                            if (year % 400 === 0)
-                                            isValid = true;
-                                        else isValid = false;
-                                        else isValid = true;
-                                        else isValid = false;
-                                    }
-                                } else isValid = false;
+                            }
+                        }
+
+                        if (isValid && opts.hourFormat !== "24" && opts.regex.hrs24.test(chrs)) {
+
+                            var tmp = parseInt(chrs, 10);
+
+                            if (tmp == 24) {
+                                buffer[pos + 5] = "a";
+                                buffer[pos + 6] = "m";
+                            } else {
+                                buffer[pos + 5] = "p";
+                                buffer[pos + 6] = "m";
+                            }
+
+                            tmp = tmp - 12;
+
+                            if (tmp < 10) {
+                                buffer[pos] = tmp.toString();
+                                buffer[pos - 1] = "0";
+                            } else {
+                                buffer[pos] = tmp.toString().charAt(1);
+                                buffer[pos - 1] = tmp.toString().charAt(0);
+                            }
+
+                            return { "pos": pos, "c": buffer[pos] };
+                        }
+
+                        return isValid;
+                    },
+                    cardinality: 2,
+                    prevalidator: [{
+                        validator: function (chrs, buffer, pos, strict, opts) {
+                            var isValid = opts.regex.hrspre.test(chrs);
+                            if (!strict && !isValid) {
+                                isValid = opts.regex.hrs.test("0" + chrs);
                                 if (isValid) {
-                                    buffer[pos-1] = yearPrefix[0];
-                                    buffer[pos++] = yearPrefix[1];
-                                    buffer[pos++] = chrs[0];
+                                    buffer[pos] = "0";
+                                    pos++;
                                     return { "pos": pos };
                                 }
                             }
                             return isValid;
-                        }, cardinality: 2 },
-                        { validator: function(chrs, buffer, pos, strict, opts) {
-                        	return opts.isInYearRange(chrs, opts.yearrange.minyear, opts.yearrange.maxyear);
-                        }, cardinality: 3 }
-                        ]
-                        }
-                    },
-                    insertMode: false,
-                    autoUnmask: false
-                },
-                'mm/dd/yyyy': {
-                    placeholder: "mm/dd/yyyy",
-                    alias: "dd/mm/yyyy", //reuse functionality of dd/mm/yyyy alias
-                    regex: {
-                        val2pre: function(separator) { var escapedSeparator = $.inputmask.escapeRegex.call(this, separator); return new RegExp("((0[13-9]|1[012])" + escapedSeparator + "[0-3])|(02" + escapedSeparator + "[0-2])"); }, //daypre
-                        val2: function(separator) { var escapedSeparator = $.inputmask.escapeRegex.call(this, separator); return new RegExp("((0[1-9]|1[012])" + escapedSeparator + "(0[1-9]|[12][0-9]))|((0[13-9]|1[012])" + escapedSeparator + "30)|((0[13578]|1[02])" + escapedSeparator + "31)"); }, //day
-                        val1pre: new RegExp("[01]"), //monthpre
-                        val1: new RegExp("0[1-9]|1[012]") //month
-                    },
-                    leapday: "02/29/",
-                    onKeyUp: function(e, opts) {
-                        var $input = $(this), input = this;
-                        if (e.ctrlKey && e.keyCode == opts.keyCode.RIGHT) {
-                            var today = new Date();
-                            $input.val((today.getMonth() + 1).toString() + today.getDate().toString() + today.getFullYear().toString());
-                        }
-                    }
+                        }, cardinality: 1
+                    }]
                 },
-                'yyyy/mm/dd': {
-                    mask: "y/1/2",
-                    placeholder: "yyyy/mm/dd",
-                    alias: "mm/dd/yyyy",
-                    leapday: "/02/29",
-                    onKeyUp: function(e, opts) {
-                        var $input = $(this), input = this;
-                        if (e.ctrlKey && e.keyCode == opts.keyCode.RIGHT) {
-                            var today = new Date();
-                            $input.val(today.getFullYear().toString() + (today.getMonth() + 1).toString() + today.getDate().toString());
+                't': { //am/pm
+                    validator: function (chrs, buffer, pos, strict, opts) {
+                        var isValid = opts.regex.ampm.test(chrs);
+                        if (!strict && !isValid) {
+                            isValid = opts.regex.ampm.test(chrs + 'm');
+                            if (isValid) {
+                                buffer[pos - 1] = chrs.charAt(0);
+                                buffer[pos] = "m";
+                                pos++;
+                                return pos;
+                            }
                         }
+                        return isValid;
                     },
-                    definitions: {
-                        '2': { //val2 ~ day or month
-                            validator: function(chrs, buffer, pos, strict, opts) {
-                                var frontValue = buffer.join('').substr(5, 3);
-                                var isValid = opts.regex.val2(opts.separator).test(frontValue + chrs);
-                                if (!strict && !isValid) {
-                                    if (chrs.charAt(1) == opts.separator || "-./".indexOf(chrs.charAt(1)) != -1 ) {
-                                        isValid = opts.regex.val2(opts.separator).test(frontValue + "0" + chrs.charAt(0));
-                                        if (isValid) {
-                                            buffer[pos - 1] = "0";
-                                            return { "pos": pos, "c": chrs.charAt(0) };
-                                        }
-                                    }
-                                }
-
-                                //check leap yeap
+                    casing: "lower",
+                    cardinality: 2,
+                    prevalidator: [{
+                        validator: function (chrs, buffer, pos, strict, opts) {
+                            var isValid = opts.regex.ampmpre.test(chrs);
+                            if (isValid) {
+                                isValid = opts.regex.ampm.test(chrs + "m");
                                 if (isValid) {
-                                    var dayMonthValue = buffer.join('').substr(4, 4) + chrs;
-                                    if (dayMonthValue != opts.leapday)
-                                        return true;
-                                    else {
-                                        var year = parseInt(buffer.join('').substr(0, 4),10);  //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;
-                                    }
+                                    buffer[pos] = chrs;
+                                    buffer[pos + 1] = 'm';
+                                    return pos;
                                 }
-
-                                return isValid;
-                            },
-                            cardinality: 2,
-                            prevalidator: [{ validator: function(chrs, buffer, pos, strict, opts) {
-                                var frontValue = buffer.join('').substr(5, 3);
-                                var isValid = opts.regex.val2pre(opts.separator).test(frontValue + chrs);
-                                if (!strict && !isValid) {
-                                    isValid = opts.regex.val2(opts.separator).test(frontValue + "0" + chrs);
-                                    if (isValid) {
-                                        buffer[pos] = "0";
-                                        pos++;
-                                        return { "pos": pos };
-                                    }
-                                }
-                                return isValid;
-                            }, cardinality: 1}]
                             }
-                        }
-                    },
-                    'dd.mm.yyyy': {
-                        mask: "1.2.y",
-                        placeholder: "dd.mm.yyyy",
-                        leapday: "29.02.",
-                        separator: '.',
-                        alias: "dd/mm/yyyy"
-                    },
-                    'dd-mm-yyyy': {
-                        mask: "1-2-y",
-                        placeholder: "dd-mm-yyyy",
-                        leapday: "29-02-",
-                        separator: '-',
-                        alias: "dd/mm/yyyy"
-                    },
-                    'mm.dd.yyyy': {
-                        mask: "1.2.y",
-                        placeholder: "mm.dd.yyyy",
-                        leapday: "02.29.",
-                        separator: '.',
-                        alias: "mm/dd/yyyy"
-                    },
-                    'mm-dd-yyyy': {
-                        mask: "1-2-y",
-                        placeholder: "mm-dd-yyyy",
-                        leapday: "02-29-",
-                        separator: '-',
-                        alias: "mm/dd/yyyy"
-                    },
-                    'yyyy.mm.dd': {
-                        mask: "y.1.2",
-                        placeholder: "yyyy.mm.dd",
-                        leapday: ".02.29",
-                        separator: '.',
-                        alias: "yyyy/mm/dd"
-                    },
-                    'yyyy-mm-dd': {
-                        mask: "y-1-2",
-                        placeholder: "yyyy-mm-dd",
-                        leapday: "-02-29",
-                        separator: '-',
-                        alias: "yyyy/mm/dd"
-                    },
-                    'datetime': {
-        				mask: "1/2/y h:s",
-                        placeholder: "dd/mm/yyyy hh:mm",
-                        alias: "dd/mm/yyyy",
-        				regex: {
-            					hrspre: new RegExp("[012]"), //hours pre
-            					hrs24: new RegExp("2[0-9]|1[3-9]"),
-            					hrs: new RegExp("[01][0-9]|2[0-3]"), //hours
-            					ampmpre: new RegExp("[apAP]"),
-            					ampm: new RegExp("^[a|p|A|P][m|M]")
-        				},
-        				timeseparator: ':',
-        				hourFormat: "24", // or 12
-        				definitions: {
-            				'h': { //hours
-                				validator: function(chrs, buffer, pos, strict, opts) {
-                    			var isValid = opts.regex.hrs.test(chrs);
-                    			if (!strict && !isValid) {
-                        		if (chrs.charAt(1) == opts.timeseparator || "-.:".indexOf(chrs.charAt(1)) != -1 ) {
-                            		isValid = opts.regex.hrs.test("0" + chrs.charAt(0));
-                            	if (isValid) {
-                                	buffer[pos - 1] = "0";
-                                	buffer[pos] = chrs.charAt(0);
-                                	pos++;
-                                	return { "pos": pos };
-                            	}
-                        	}
-                    	}
-
-                    	if ( isValid && opts.hourFormat !== "24" && opts.regex.hrs24.test(chrs) ) {
-
-                        	var tmp = parseInt(chrs,10);
-
-                        	if ( tmp == 24 ) {
-                            	buffer[pos+5] = "a";
-                            	buffer[pos+6] = "m";
-                        	} else {
-                            	buffer[pos+5] = "p";
-                            	buffer[pos+6] = "m";
-                        	}
-
-                        	tmp = tmp - 12;
-
-                        	if ( tmp < 10 ) {
-                            	buffer[pos] = tmp.toString();
-                            	buffer[pos-1] = "0";
-                        	} else {
-                            	buffer[pos] = tmp.toString().charAt(1);
-                            	buffer[pos-1] = tmp.toString().charAt(0);
-                        	}
-
-                        	return { "pos": pos, "c" : buffer[pos] };
-                    	}
-
-                    	return isValid;
-                	},
-                	cardinality: 2,
-                	prevalidator: [{ validator: function(chrs, buffer, pos, strict, opts) {
-                    	var isValid = opts.regex.hrspre.test(chrs);
-                    	if (!strict && !isValid) {
-                        	isValid = opts.regex.hrs.test("0" + chrs);
-                        	if (isValid) {
-                            	buffer[pos] = "0";
-                            	pos++;
-                            	return { "pos": pos };
-                        	}
-                    	}
-                    	return isValid;
-                		}, cardinality: 1}]
-            		},
-            	't': { //am/pm
-                	validator: function(chrs, buffer, pos, strict, opts) {
-                    	var isValid = opts.regex.ampm.test(chrs);
-                    	if (!strict && !isValid) {
-                        	isValid = opts.regex.ampm.test(chrs+'m');
-                        	if (isValid) {
-                            	buffer[pos - 1] = chrs.charAt(0);
-                            	buffer[pos] = "m";
-                            	pos++;
-                            	return pos;
-                        	}
-                    	}
-                    	return isValid;
-                	},
-                	casing: "lower",
-                	cardinality: 2,
-                	prevalidator: [{ validator: function(chrs, buffer, pos, strict, opts) {
-                    	var isValid = opts.regex.ampmpre.test(chrs);
-                    	if (isValid) {
-                        	isValid = opts.regex.ampm.test(chrs+"m");
-                        	if (isValid) {
-                            	buffer[pos] = chrs;
-                            	buffer[pos+1] = 'm';
-                            	return pos;
-                        	}
-                    	}
-                    	return isValid;
-                					}, cardinality: 1}]
-            					}
-        					},
-        				insertMode: false,
-        				autoUnmask: false
-    				},
-    				'datetime12': {
-    					mask: "1/2/y h:s t",
-                        placeholder: "dd/mm/yyyy hh:mm xm",
-                        alias: "datetime",
-        				hourFormat: "12"
-    				}, 
-    				'hh:mm t': {
-    					mask: "h:s t",
-                        placeholder: "hh:mm xm",
-                        alias: "datetime",
-        				hourFormat: "12"
-    				}, 
-    				'h:s t': {
-        				mask: "h:s t",
-        				placeholder: "hh:mm xm",
-        				alias: "datetime",
-        				hourFormat: "12"
-       				 },
-                    'hh:mm:ss': {
-                        mask: "h:s:s",
-                        autoUnmask: false
-                    },
-                    'hh:mm': {
-                        mask: "h:s",
-                        autoUnmask: false
-                    },
-                    'date': {
-                        alias: "dd/mm/yyyy" // "mm/dd/yyyy"
-                    }
-                });
-            })(jQuery);/*
+                            return isValid;
+                        }, cardinality: 1
+                    }]
+                }
+            },
+            insertMode: false,
+            autoUnmask: false
+        },
+        'datetime12': {
+            mask: "1/2/y h:s t",
+            placeholder: "dd/mm/yyyy hh:mm xm",
+            alias: "datetime",
+            hourFormat: "12"
+        },
+        'hh:mm t': {
+            mask: "h:s t",
+            placeholder: "hh:mm xm",
+            alias: "datetime",
+            hourFormat: "12"
+        },
+        'h:s t': {
+            mask: "h:s t",
+            placeholder: "hh:mm xm",
+            alias: "datetime",
+            hourFormat: "12"
+        },
+        'hh:mm:ss': {
+            mask: "h:s:s",
+            autoUnmask: false
+        },
+        'hh:mm': {
+            mask: "h:s",
+            autoUnmask: false
+        },
+        'date': {
+            alias: "dd/mm/yyyy" // "mm/dd/yyyy"
+        }
+    });
+})(jQuery);/*
 Input Mask plugin extensions
 http://github.com/RobinHerbots/jquery.inputmask
 Copyright (c) 2010 - 2013 Robin Herbots
@@ -1691,12 +1706,11 @@ Optional extensions on the jquery.inputmask base
                 var bufVal = cbuf.join('');
                 if (opts.autoGroup || (reformatOnly && bufVal.indexOf(opts.groupSeparator) != -1)) {
                     bufVal = bufVal.replace(new RegExp("\\" + opts.groupSeparator, "g"), '');
-                    
                     var reg = new RegExp('([-\+]?[\\d\?]+)([\\d\?]{' + opts.groupSize + '})');
                     while (reg.test(bufVal)) {
                         bufVal = bufVal.replace(reg, '$1' + opts.groupSeparator + '$2');
+                        bufVal = bufVal.replace(opts.groupSeparator + opts.groupSeparator, opts.groupSeparator);
                     }
-                    
                 }
                 buffer.length = bufVal.length; //align the length
                 for (var i = 0, l = bufVal.length; i < l; i++) {
@@ -1715,7 +1729,7 @@ Optional extensions on the jquery.inputmask base
                     return new RegExp("^[\+-]?(\\d+|\\d{1," + groupSize + "}((" + escapedGroupSeparator + "\\d{" + groupSize + "})?)+)(" + escapedRadixPoint + "\\d" + digitExpression + ")?$");
                 }
             },
-            onKeyDown: function (e, opts) {
+            onKeyDown: function (e, buffer, opts) {
                 var $input = $(this), input = this;
                 if (e.keyCode == opts.keyCode.TAB) {
                     var nptStr = input._valueGet();
@@ -1729,11 +1743,8 @@ Optional extensions on the jquery.inputmask base
                         }
                     }
                 } else if (e.keyCode == opts.keyCode.DELETE || e.keyCode == opts.keyCode.BACKSPACE) {
-                    var nptStr = input._valueGet(),
-                    buffer = nptStr.split('');
-                    var newPos = opts.postFormat(buffer, 0, true, opts);
-                    nptStr = buffer.join('');
-                    input._valueSet(nptStr);
+                    opts.postFormat(buffer, 0, true, opts);
+                    input._valueSet(buffer.join(''));
                 }
             },
             definitions: {
@@ -1778,7 +1789,7 @@ Optional extensions on the jquery.inputmask base
                         }
 
                         if (isValid != false && !strict) {
-                            var newPos = opts.postFormat(buffer, pos, false, opts);
+                            var newPos = opts.postFormat(buffer, pos + 1, false, opts);
                             return { "pos": newPos };
                         }
                         return isValid;

ファイルの差分が大きいため隠しています
+ 46 - 46
dist/jquery.inputmask.bundle.min.js


ファイルの差分が大きいため隠しています
+ 8 - 8
dist/min/jquery.inputmask.date.extensions.js


ファイルの差分が大きいため隠しています
+ 7 - 7
dist/min/jquery.inputmask.js


ファイルの差分が大きいため隠しています
+ 5 - 5
dist/min/jquery.inputmask.numeric.extensions.js


+ 382 - 367
js/jquery.inputmask.date.extensions.js

@@ -7,28 +7,28 @@ Version: 0.0.0
 
 Optional extensions on the jquery.inputmask base
 */
-(function($) {
+(function ($) {
     //date & time aliases
     $.extend($.inputmask.defaults.definitions, {
         'h': { //hours
             validator: "[01][0-9]|2[0-3]",
             cardinality: 2,
-            prevalidator: [{ validator: "[0-2]", cardinality: 1}]
+            prevalidator: [{ validator: "[0-2]", cardinality: 1 }]
         },
         's': { //seconds || minutes
             validator: "[0-5][0-9]",
             cardinality: 2,
-            prevalidator: [{ validator: "[0-5]", cardinality: 1}]
+            prevalidator: [{ validator: "[0-5]", cardinality: 1 }]
         },
         'd': { //basic day
             validator: "0[1-9]|[12][0-9]|3[01]",
             cardinality: 2,
-            prevalidator: [{ validator: "[0-3]", cardinality: 1}]
+            prevalidator: [{ validator: "[0-3]", cardinality: 1 }]
         },
         'm': { //basic month
             validator: "0[1-9]|1[012]",
             cardinality: 2,
-            prevalidator: [{ validator: "[01]", cardinality: 1}]
+            prevalidator: [{ validator: "[01]", cardinality: 1 }]
         },
         'y': { //basic year
             validator: "(19|20)\\d{2}",
@@ -37,7 +37,7 @@ Optional extensions on the jquery.inputmask base
                         { validator: "[12]", cardinality: 1 },
                         { validator: "(19|20)", cardinality: 2 },
                         { validator: "(19|20)\\d", cardinality: 3 }
-                        ]
+            ]
         }
     });
     $.extend($.inputmask.defaults.aliases, {
@@ -47,27 +47,27 @@ Optional extensions on the jquery.inputmask base
             regex: {
                 val1pre: new RegExp("[0-3]"), //daypre
                 val1: new RegExp("0[1-9]|[12][0-9]|3[01]"), //day
-                val2pre: function(separator) { var escapedSeparator = $.inputmask.escapeRegex.call(this, separator); return new RegExp("((0[1-9]|[12][0-9]|3[01])" + escapedSeparator + "[01])"); }, //monthpre
-                val2: function(separator) { var escapedSeparator = $.inputmask.escapeRegex.call(this, separator); return new RegExp("((0[1-9]|[12][0-9])" + escapedSeparator + "(0[1-9]|1[012]))|(30" + escapedSeparator + "(0[13-9]|1[012]))|(31" + escapedSeparator + "(0[13578]|1[02]))"); }//month
+                val2pre: function (separator) { var escapedSeparator = $.inputmask.escapeRegex.call(this, separator); return new RegExp("((0[1-9]|[12][0-9]|3[01])" + escapedSeparator + "[01])"); }, //monthpre
+                val2: function (separator) { var escapedSeparator = $.inputmask.escapeRegex.call(this, separator); return new RegExp("((0[1-9]|[12][0-9])" + escapedSeparator + "(0[1-9]|1[012]))|(30" + escapedSeparator + "(0[13-9]|1[012]))|(31" + escapedSeparator + "(0[13578]|1[02]))"); }//month
             },
             leapday: "29/02/",
             separator: '/',
             yearrange: { minyear: 1900, maxyear: 2099 },
-            isInYearRange: function(chrs, minyear, maxyear){
-            	var enteredyear = parseInt(chrs.concat(minyear.toString().slice(chrs.length)));
-            	var enteredyear2 = parseInt(chrs.concat(maxyear.toString().slice(chrs.length)));
-            	return (enteredyear != NaN ? minyear <= enteredyear && enteredyear <= maxyear : false) ||
-            		   (enteredyear2 != NaN ? minyear <= enteredyear2 && enteredyear2 <= maxyear : false); 
+            isInYearRange: function (chrs, minyear, maxyear) {
+                var enteredyear = parseInt(chrs.concat(minyear.toString().slice(chrs.length)));
+                var enteredyear2 = parseInt(chrs.concat(maxyear.toString().slice(chrs.length)));
+                return (enteredyear != NaN ? minyear <= enteredyear && enteredyear <= maxyear : false) ||
+            		   (enteredyear2 != NaN ? minyear <= enteredyear2 && enteredyear2 <= maxyear : false);
             },
-            determinebaseyear: function(minyear, maxyear){
-            	var currentyear = (new Date()).getFullYear();
-            	if(minyear > currentyear) return minyear;
-            	if(maxyear < currentyear) return maxyear;
-            	
-            	return currentyear;
+            determinebaseyear: function (minyear, maxyear) {
+                var currentyear = (new Date()).getFullYear();
+                if (minyear > currentyear) return minyear;
+                if (maxyear < currentyear) return maxyear;
+
+                return currentyear;
             },
-            onKeyUp: function(e, opts) {
-                var $input = $(this), input = this;
+            onKeyUp: function (e, buffer, opts) {
+                var $input = $(this);
                 if (e.ctrlKey && e.keyCode == opts.keyCode.RIGHT) {
                     var today = new Date();
                     $input.val(today.getDate().toString() + (today.getMonth() + 1).toString() + today.getFullYear().toString());
@@ -75,50 +75,53 @@ Optional extensions on the jquery.inputmask base
             },
             definitions: {
                 '1': { //val1 ~ day or month
-                    validator: function(chrs, buffer, pos, strict, opts) {
+                    validator: function (chrs, buffer, pos, strict, opts) {
                         var isValid = opts.regex.val1.test(chrs);
                         if (!strict && !isValid) {
-                            if (chrs.charAt(1) == opts.separator || "-./".indexOf(chrs.charAt(1)) != -1 ) {
+                            if (chrs.charAt(1) == opts.separator || "-./".indexOf(chrs.charAt(1)) != -1) {
                                 isValid = opts.regex.val1.test("0" + chrs.charAt(0));
                                 if (isValid) {
                                     buffer[pos - 1] = "0";
-                                    return { "pos": pos ,"c": chrs.charAt(0) };
+                                    return { "pos": pos, "c": chrs.charAt(0) };
                                 }
                             }
                         }
                         return isValid;
                     },
                     cardinality: 2,
-                    prevalidator: [{ validator: function(chrs, buffer, pos, strict, opts) {
-                        var isValid = opts.regex.val1pre.test(chrs);
+                    prevalidator: [{
+                        validator: function (chrs, buffer, pos, strict, opts) {
+                            var isValid = opts.regex.val1pre.test(chrs);
+                            if (!strict && !isValid) {
+                                isValid = opts.regex.val1.test("0" + chrs);
+                                if (isValid) {
+                                    buffer[pos] = "0";
+                                    pos++;
+                                    return { "pos": pos };
+                                }
+                            }
+                            return isValid;
+                        }, cardinality: 1
+                    }]
+                },
+                '2': { //val2 ~ day or month
+                    validator: function (chrs, buffer, pos, strict, opts) {
+                        var frontValue = buffer.join('').substr(0, 3);
+                        var isValid = opts.regex.val2(opts.separator).test(frontValue + chrs);
                         if (!strict && !isValid) {
-                            isValid = opts.regex.val1.test("0" + chrs);
-                            if (isValid) {
-                                buffer[pos] = "0";
-                                pos++;
-                                return { "pos": pos };
+                            if (chrs.charAt(1) == opts.separator || "-./".indexOf(chrs.charAt(1)) != -1) {
+                                isValid = opts.regex.val2(opts.separator).test(frontValue + "0" + chrs.charAt(0));
+                                if (isValid) {
+                                    buffer[pos - 1] = "0";
+                                    return { "pos": pos, "c": chrs.charAt(0) };
+                                }
                             }
                         }
                         return isValid;
-                    }, cardinality: 1}]
                     },
-                    '2': { //val2 ~ day or month
-                        validator: function(chrs, buffer, pos, strict, opts) {
-                            var frontValue = buffer.join('').substr(0, 3);
-                            var isValid = opts.regex.val2(opts.separator).test(frontValue + chrs);
-                            if (!strict && !isValid) {
-                                if (chrs.charAt(1) == opts.separator || "-./".indexOf(chrs.charAt(1)) != -1 ) {
-                                    isValid = opts.regex.val2(opts.separator).test(frontValue + "0" + chrs.charAt(0));
-                                    if (isValid) {
-                                        buffer[pos - 1] = "0";
-                                        return { "pos": pos, "c": chrs.charAt(0) };
-                                    }
-                                }
-                            }
-                            return isValid;
-                        },
-                        cardinality: 2,
-                        prevalidator: [{ validator: function(chrs, buffer, pos, strict, opts) {
+                    cardinality: 2,
+                    prevalidator: [{
+                        validator: function (chrs, buffer, pos, strict, opts) {
                             var frontValue = buffer.join('').substr(0, 3);
                             var isValid = opts.regex.val2pre(opts.separator).test(frontValue + chrs);
                             if (!strict && !isValid) {
@@ -130,350 +133,362 @@ Optional extensions on the jquery.inputmask base
                                 }
                             }
                             return isValid;
-                        }, cardinality: 1}]
-                        },
-                        'y': { //year
-                            validator: function(chrs, buffer, pos, strict, opts) {
-                                if (opts.isInYearRange(chrs, opts.yearrange.minyear, opts.yearrange.maxyear)) {
-                                    var dayMonthValue = buffer.join('').substr(0, 6);
-                                    if (dayMonthValue != opts.leapday)
-                                        return true;
-                                    else {
-                                        var year = parseInt(chrs,10);//detect leap year
-                                        if (year % 4 === 0)
-                                            if (year % 100 === 0)
-                                            if (year % 400 === 0)
+                        }, cardinality: 1
+                    }]
+                },
+                'y': { //year
+                    validator: function (chrs, buffer, pos, strict, opts) {
+                        if (opts.isInYearRange(chrs, opts.yearrange.minyear, opts.yearrange.maxyear)) {
+                            var dayMonthValue = buffer.join('').substr(0, 6);
+                            if (dayMonthValue != opts.leapday)
+                                return true;
+                            else {
+                                var year = parseInt(chrs, 10);//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: function(chrs, buffer, pos, strict, opts) {
-                            var isValid = opts.isInYearRange(chrs, opts.yearrange.minyear, opts.yearrange.maxyear);
-                            if (!strict && !isValid) {
-                                var yearPrefix = opts.determinebaseyear(opts.yearrange.minyear, opts.yearrange.maxyear).toString().slice(0, 1);
+                                    else return true;
+                                else return false;
+                            }
+                        } else return false;
+                    },
+                    cardinality: 4,
+                    prevalidator: [
+                {
+                    validator: function (chrs, buffer, pos, strict, opts) {
+                        var isValid = opts.isInYearRange(chrs, opts.yearrange.minyear, opts.yearrange.maxyear);
+                        if (!strict && !isValid) {
+                            var yearPrefix = opts.determinebaseyear(opts.yearrange.minyear, opts.yearrange.maxyear).toString().slice(0, 1);
 
-                                isValid = opts.isInYearRange(yearPrefix + chrs, opts.yearrange.minyear, opts.yearrange.maxyear);
-                                if (isValid) {
-                                    buffer[pos++] = yearPrefix[0];
-                                    return { "pos": pos };
-                                }
-                                yearPrefix = opts.determinebaseyear(opts.yearrange.minyear, opts.yearrange.maxyear).toString().slice(0, 2);
+                            isValid = opts.isInYearRange(yearPrefix + chrs, opts.yearrange.minyear, opts.yearrange.maxyear);
+                            if (isValid) {
+                                buffer[pos++] = yearPrefix[0];
+                                return { "pos": pos };
+                            }
+                            yearPrefix = opts.determinebaseyear(opts.yearrange.minyear, opts.yearrange.maxyear).toString().slice(0, 2);
 
-                                isValid = opts.isInYearRange(yearPrefix + chrs, opts.yearrange.minyear, opts.yearrange.maxyear);
-                                if (isValid) {
-                                    buffer[pos++] = yearPrefix[0];
-                                    buffer[pos++] = yearPrefix[1];
-                                    return { "pos": pos };
-                                }
+                            isValid = opts.isInYearRange(yearPrefix + chrs, opts.yearrange.minyear, opts.yearrange.maxyear);
+                            if (isValid) {
+                                buffer[pos++] = yearPrefix[0];
+                                buffer[pos++] = yearPrefix[1];
+                                return { "pos": pos };
                             }
-                            return isValid;
-                        },
-                            cardinality: 1
-                        },
-                        { validator: function(chrs, buffer, pos, strict, opts) {
-                            var isValid = opts.isInYearRange(chrs, opts.yearrange.minyear, opts.yearrange.maxyear);
-                            if (!strict && !isValid) {
-                                var yearPrefix = opts.determinebaseyear(opts.yearrange.minyear, opts.yearrange.maxyear).toString().slice(0, 2);
+                        }
+                        return isValid;
+                    },
+                    cardinality: 1
+                },
+                {
+                    validator: function (chrs, buffer, pos, strict, opts) {
+                        var isValid = opts.isInYearRange(chrs, opts.yearrange.minyear, opts.yearrange.maxyear);
+                        if (!strict && !isValid) {
+                            var yearPrefix = opts.determinebaseyear(opts.yearrange.minyear, opts.yearrange.maxyear).toString().slice(0, 2);
 
-                                isValid = opts.isInYearRange(yearPrefix + chrs[1], opts.yearrange.minyear, opts.yearrange.maxyear);
-                                if (isValid) {
-                                    buffer[pos++] = yearPrefix[1];
-                                    return { "pos": pos };
-                                }
-                            
-                                yearPrefix = opts.determinebaseyear(opts.yearrange.minyear, opts.yearrange.maxyear).toString().slice(0, 2);
-                                if (opts.isInYearRange(yearPrefix + chrs, opts.yearrange.minyear, opts.yearrange.maxyear)) {
-                                    var dayMonthValue = buffer.join('').substr(0, 6);
-                                    if (dayMonthValue != opts.leapday)
-                                        isValid = true;
-                                    else {
-                                        var year = parseInt(chrs,10);//detect leap year
-                                        if (year % 4 === 0)
-                                            if (year % 100 === 0)
+                            isValid = opts.isInYearRange(yearPrefix + chrs[1], opts.yearrange.minyear, opts.yearrange.maxyear);
+                            if (isValid) {
+                                buffer[pos++] = yearPrefix[1];
+                                return { "pos": pos };
+                            }
+
+                            yearPrefix = opts.determinebaseyear(opts.yearrange.minyear, opts.yearrange.maxyear).toString().slice(0, 2);
+                            if (opts.isInYearRange(yearPrefix + chrs, opts.yearrange.minyear, opts.yearrange.maxyear)) {
+                                var dayMonthValue = buffer.join('').substr(0, 6);
+                                if (dayMonthValue != opts.leapday)
+                                    isValid = true;
+                                else {
+                                    var year = parseInt(chrs, 10);//detect leap year
+                                    if (year % 4 === 0)
+                                        if (year % 100 === 0)
                                             if (year % 400 === 0)
-                                            isValid = true;
-                                        else isValid = false;
+                                                isValid = true;
+                                            else isValid = false;
                                         else isValid = true;
-                                        else isValid = false;
-                                    }
-                                } else isValid = false;
-                                if (isValid) {
-                                    buffer[pos-1] = yearPrefix[0];
-                                    buffer[pos++] = yearPrefix[1];
-                                    buffer[pos++] = chrs[0];
-                                    return { "pos": pos };
+                                    else isValid = false;
                                 }
+                            } else isValid = false;
+                            if (isValid) {
+                                buffer[pos - 1] = yearPrefix[0];
+                                buffer[pos++] = yearPrefix[1];
+                                buffer[pos++] = chrs[0];
+                                return { "pos": pos };
                             }
-                            return isValid;
-                        }, cardinality: 2 },
-                        { validator: function(chrs, buffer, pos, strict, opts) {
-                        	return opts.isInYearRange(chrs, opts.yearrange.minyear, opts.yearrange.maxyear);
-                        }, cardinality: 3 }
-                        ]
                         }
-                    },
-                    insertMode: false,
-                    autoUnmask: false
-                },
-                'mm/dd/yyyy': {
-                    placeholder: "mm/dd/yyyy",
-                    alias: "dd/mm/yyyy", //reuse functionality of dd/mm/yyyy alias
-                    regex: {
-                        val2pre: function(separator) { var escapedSeparator = $.inputmask.escapeRegex.call(this, separator); return new RegExp("((0[13-9]|1[012])" + escapedSeparator + "[0-3])|(02" + escapedSeparator + "[0-2])"); }, //daypre
-                        val2: function(separator) { var escapedSeparator = $.inputmask.escapeRegex.call(this, separator); return new RegExp("((0[1-9]|1[012])" + escapedSeparator + "(0[1-9]|[12][0-9]))|((0[13-9]|1[012])" + escapedSeparator + "30)|((0[13578]|1[02])" + escapedSeparator + "31)"); }, //day
-                        val1pre: new RegExp("[01]"), //monthpre
-                        val1: new RegExp("0[1-9]|1[012]") //month
-                    },
-                    leapday: "02/29/",
-                    onKeyUp: function(e, opts) {
-                        var $input = $(this), input = this;
-                        if (e.ctrlKey && e.keyCode == opts.keyCode.RIGHT) {
-                            var today = new Date();
-                            $input.val((today.getMonth() + 1).toString() + today.getDate().toString() + today.getFullYear().toString());
-                        }
-                    }
+                        return isValid;
+                    }, cardinality: 2
                 },
-                'yyyy/mm/dd': {
-                    mask: "y/1/2",
-                    placeholder: "yyyy/mm/dd",
-                    alias: "mm/dd/yyyy",
-                    leapday: "/02/29",
-                    onKeyUp: function(e, opts) {
-                        var $input = $(this), input = this;
-                        if (e.ctrlKey && e.keyCode == opts.keyCode.RIGHT) {
-                            var today = new Date();
-                            $input.val(today.getFullYear().toString() + (today.getMonth() + 1).toString() + today.getDate().toString());
-                        }
-                    },
-                    definitions: {
-                        '2': { //val2 ~ day or month
-                            validator: function(chrs, buffer, pos, strict, opts) {
-                                var frontValue = buffer.join('').substr(5, 3);
-                                var isValid = opts.regex.val2(opts.separator).test(frontValue + chrs);
-                                if (!strict && !isValid) {
-                                    if (chrs.charAt(1) == opts.separator || "-./".indexOf(chrs.charAt(1)) != -1 ) {
-                                        isValid = opts.regex.val2(opts.separator).test(frontValue + "0" + chrs.charAt(0));
-                                        if (isValid) {
-                                            buffer[pos - 1] = "0";
-                                            return { "pos": pos, "c": chrs.charAt(0) };
-                                        }
-                                    }
+                {
+                    validator: function (chrs, buffer, pos, strict, opts) {
+                        return opts.isInYearRange(chrs, opts.yearrange.minyear, opts.yearrange.maxyear);
+                    }, cardinality: 3
+                }
+                    ]
+                }
+            },
+            insertMode: false,
+            autoUnmask: false
+        },
+        'mm/dd/yyyy': {
+            placeholder: "mm/dd/yyyy",
+            alias: "dd/mm/yyyy", //reuse functionality of dd/mm/yyyy alias
+            regex: {
+                val2pre: function (separator) { var escapedSeparator = $.inputmask.escapeRegex.call(this, separator); return new RegExp("((0[13-9]|1[012])" + escapedSeparator + "[0-3])|(02" + escapedSeparator + "[0-2])"); }, //daypre
+                val2: function (separator) { var escapedSeparator = $.inputmask.escapeRegex.call(this, separator); return new RegExp("((0[1-9]|1[012])" + escapedSeparator + "(0[1-9]|[12][0-9]))|((0[13-9]|1[012])" + escapedSeparator + "30)|((0[13578]|1[02])" + escapedSeparator + "31)"); }, //day
+                val1pre: new RegExp("[01]"), //monthpre
+                val1: new RegExp("0[1-9]|1[012]") //month
+            },
+            leapday: "02/29/",
+            onKeyUp: function (e, buffer, opts) {
+                var $input = $(this);
+                if (e.ctrlKey && e.keyCode == opts.keyCode.RIGHT) {
+                    var today = new Date();
+                    $input.val((today.getMonth() + 1).toString() + today.getDate().toString() + today.getFullYear().toString());
+                }
+            }
+        },
+        'yyyy/mm/dd': {
+            mask: "y/1/2",
+            placeholder: "yyyy/mm/dd",
+            alias: "mm/dd/yyyy",
+            leapday: "/02/29",
+            onKeyUp: function (e, buffer, opts) {
+                var $input = $(this);
+                if (e.ctrlKey && e.keyCode == opts.keyCode.RIGHT) {
+                    var today = new Date();
+                    $input.val(today.getFullYear().toString() + (today.getMonth() + 1).toString() + today.getDate().toString());
+                }
+            },
+            definitions: {
+                '2': { //val2 ~ day or month
+                    validator: function (chrs, buffer, pos, strict, opts) {
+                        var frontValue = buffer.join('').substr(5, 3);
+                        var isValid = opts.regex.val2(opts.separator).test(frontValue + chrs);
+                        if (!strict && !isValid) {
+                            if (chrs.charAt(1) == opts.separator || "-./".indexOf(chrs.charAt(1)) != -1) {
+                                isValid = opts.regex.val2(opts.separator).test(frontValue + "0" + chrs.charAt(0));
+                                if (isValid) {
+                                    buffer[pos - 1] = "0";
+                                    return { "pos": pos, "c": chrs.charAt(0) };
                                 }
+                            }
+                        }
 
-                                //check leap yeap
-                                if (isValid) {
-                                    var dayMonthValue = buffer.join('').substr(4, 4) + chrs;
-                                    if (dayMonthValue != opts.leapday)
-                                        return true;
-                                    else {
-                                        var year = parseInt(buffer.join('').substr(0, 4),10);  //detect leap year
-                                        if (year % 4 === 0)
-                                            if (year % 100 === 0)
-                                            if (year % 400 === 0)
+                        //check leap yeap
+                        if (isValid) {
+                            var dayMonthValue = buffer.join('').substr(4, 4) + chrs;
+                            if (dayMonthValue != opts.leapday)
+                                return true;
+                            else {
+                                var year = parseInt(buffer.join('').substr(0, 4), 10);  //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 true;
+                                else return false;
+                            }
+                        }
 
-                                return isValid;
-                            },
-                            cardinality: 2,
-                            prevalidator: [{ validator: function(chrs, buffer, pos, strict, opts) {
-                                var frontValue = buffer.join('').substr(5, 3);
-                                var isValid = opts.regex.val2pre(opts.separator).test(frontValue + chrs);
-                                if (!strict && !isValid) {
-                                    isValid = opts.regex.val2(opts.separator).test(frontValue + "0" + chrs);
-                                    if (isValid) {
-                                        buffer[pos] = "0";
-                                        pos++;
-                                        return { "pos": pos };
-                                    }
+                        return isValid;
+                    },
+                    cardinality: 2,
+                    prevalidator: [{
+                        validator: function (chrs, buffer, pos, strict, opts) {
+                            var frontValue = buffer.join('').substr(5, 3);
+                            var isValid = opts.regex.val2pre(opts.separator).test(frontValue + chrs);
+                            if (!strict && !isValid) {
+                                isValid = opts.regex.val2(opts.separator).test(frontValue + "0" + chrs);
+                                if (isValid) {
+                                    buffer[pos] = "0";
+                                    pos++;
+                                    return { "pos": pos };
+                                }
+                            }
+                            return isValid;
+                        }, cardinality: 1
+                    }]
+                }
+            }
+        },
+        'dd.mm.yyyy': {
+            mask: "1.2.y",
+            placeholder: "dd.mm.yyyy",
+            leapday: "29.02.",
+            separator: '.',
+            alias: "dd/mm/yyyy"
+        },
+        'dd-mm-yyyy': {
+            mask: "1-2-y",
+            placeholder: "dd-mm-yyyy",
+            leapday: "29-02-",
+            separator: '-',
+            alias: "dd/mm/yyyy"
+        },
+        'mm.dd.yyyy': {
+            mask: "1.2.y",
+            placeholder: "mm.dd.yyyy",
+            leapday: "02.29.",
+            separator: '.',
+            alias: "mm/dd/yyyy"
+        },
+        'mm-dd-yyyy': {
+            mask: "1-2-y",
+            placeholder: "mm-dd-yyyy",
+            leapday: "02-29-",
+            separator: '-',
+            alias: "mm/dd/yyyy"
+        },
+        'yyyy.mm.dd': {
+            mask: "y.1.2",
+            placeholder: "yyyy.mm.dd",
+            leapday: ".02.29",
+            separator: '.',
+            alias: "yyyy/mm/dd"
+        },
+        'yyyy-mm-dd': {
+            mask: "y-1-2",
+            placeholder: "yyyy-mm-dd",
+            leapday: "-02-29",
+            separator: '-',
+            alias: "yyyy/mm/dd"
+        },
+        'datetime': {
+            mask: "1/2/y h:s",
+            placeholder: "dd/mm/yyyy hh:mm",
+            alias: "dd/mm/yyyy",
+            regex: {
+                hrspre: new RegExp("[012]"), //hours pre
+                hrs24: new RegExp("2[0-9]|1[3-9]"),
+                hrs: new RegExp("[01][0-9]|2[0-3]"), //hours
+                ampmpre: new RegExp("[apAP]"),
+                ampm: new RegExp("^[a|p|A|P][m|M]")
+            },
+            timeseparator: ':',
+            hourFormat: "24", // or 12
+            definitions: {
+                'h': { //hours
+                    validator: function (chrs, buffer, pos, strict, opts) {
+                        var isValid = opts.regex.hrs.test(chrs);
+                        if (!strict && !isValid) {
+                            if (chrs.charAt(1) == opts.timeseparator || "-.:".indexOf(chrs.charAt(1)) != -1) {
+                                isValid = opts.regex.hrs.test("0" + chrs.charAt(0));
+                                if (isValid) {
+                                    buffer[pos - 1] = "0";
+                                    buffer[pos] = chrs.charAt(0);
+                                    pos++;
+                                    return { "pos": pos };
                                 }
-                                return isValid;
-                            }, cardinality: 1}]
                             }
                         }
-                    },
-                    'dd.mm.yyyy': {
-                        mask: "1.2.y",
-                        placeholder: "dd.mm.yyyy",
-                        leapday: "29.02.",
-                        separator: '.',
-                        alias: "dd/mm/yyyy"
-                    },
-                    'dd-mm-yyyy': {
-                        mask: "1-2-y",
-                        placeholder: "dd-mm-yyyy",
-                        leapday: "29-02-",
-                        separator: '-',
-                        alias: "dd/mm/yyyy"
-                    },
-                    'mm.dd.yyyy': {
-                        mask: "1.2.y",
-                        placeholder: "mm.dd.yyyy",
-                        leapday: "02.29.",
-                        separator: '.',
-                        alias: "mm/dd/yyyy"
-                    },
-                    'mm-dd-yyyy': {
-                        mask: "1-2-y",
-                        placeholder: "mm-dd-yyyy",
-                        leapday: "02-29-",
-                        separator: '-',
-                        alias: "mm/dd/yyyy"
-                    },
-                    'yyyy.mm.dd': {
-                        mask: "y.1.2",
-                        placeholder: "yyyy.mm.dd",
-                        leapday: ".02.29",
-                        separator: '.',
-                        alias: "yyyy/mm/dd"
-                    },
-                    'yyyy-mm-dd': {
-                        mask: "y-1-2",
-                        placeholder: "yyyy-mm-dd",
-                        leapday: "-02-29",
-                        separator: '-',
-                        alias: "yyyy/mm/dd"
-                    },
-                    'datetime': {
-        				mask: "1/2/y h:s",
-                        placeholder: "dd/mm/yyyy hh:mm",
-                        alias: "dd/mm/yyyy",
-        				regex: {
-            					hrspre: new RegExp("[012]"), //hours pre
-            					hrs24: new RegExp("2[0-9]|1[3-9]"),
-            					hrs: new RegExp("[01][0-9]|2[0-3]"), //hours
-            					ampmpre: new RegExp("[apAP]"),
-            					ampm: new RegExp("^[a|p|A|P][m|M]")
-        				},
-        				timeseparator: ':',
-        				hourFormat: "24", // or 12
-        				definitions: {
-            				'h': { //hours
-                				validator: function(chrs, buffer, pos, strict, opts) {
-                    			var isValid = opts.regex.hrs.test(chrs);
-                    			if (!strict && !isValid) {
-                        		if (chrs.charAt(1) == opts.timeseparator || "-.:".indexOf(chrs.charAt(1)) != -1 ) {
-                            		isValid = opts.regex.hrs.test("0" + chrs.charAt(0));
-                            	if (isValid) {
-                                	buffer[pos - 1] = "0";
-                                	buffer[pos] = chrs.charAt(0);
-                                	pos++;
-                                	return { "pos": pos };
-                            	}
-                        	}
-                    	}
 
-                    	if ( isValid && opts.hourFormat !== "24" && opts.regex.hrs24.test(chrs) ) {
+                        if (isValid && opts.hourFormat !== "24" && opts.regex.hrs24.test(chrs)) {
 
-                        	var tmp = parseInt(chrs,10);
+                            var tmp = parseInt(chrs, 10);
 
-                        	if ( tmp == 24 ) {
-                            	buffer[pos+5] = "a";
-                            	buffer[pos+6] = "m";
-                        	} else {
-                            	buffer[pos+5] = "p";
-                            	buffer[pos+6] = "m";
-                        	}
+                            if (tmp == 24) {
+                                buffer[pos + 5] = "a";
+                                buffer[pos + 6] = "m";
+                            } else {
+                                buffer[pos + 5] = "p";
+                                buffer[pos + 6] = "m";
+                            }
 
-                        	tmp = tmp - 12;
+                            tmp = tmp - 12;
 
-                        	if ( tmp < 10 ) {
-                            	buffer[pos] = tmp.toString();
-                            	buffer[pos-1] = "0";
-                        	} else {
-                            	buffer[pos] = tmp.toString().charAt(1);
-                            	buffer[pos-1] = tmp.toString().charAt(0);
-                        	}
+                            if (tmp < 10) {
+                                buffer[pos] = tmp.toString();
+                                buffer[pos - 1] = "0";
+                            } else {
+                                buffer[pos] = tmp.toString().charAt(1);
+                                buffer[pos - 1] = tmp.toString().charAt(0);
+                            }
 
-                        	return { "pos": pos, "c" : buffer[pos] };
-                    	}
+                            return { "pos": pos, "c": buffer[pos] };
+                        }
 
-                    	return isValid;
-                	},
-                	cardinality: 2,
-                	prevalidator: [{ validator: function(chrs, buffer, pos, strict, opts) {
-                    	var isValid = opts.regex.hrspre.test(chrs);
-                    	if (!strict && !isValid) {
-                        	isValid = opts.regex.hrs.test("0" + chrs);
-                        	if (isValid) {
-                            	buffer[pos] = "0";
-                            	pos++;
-                            	return { "pos": pos };
-                        	}
-                    	}
-                    	return isValid;
-                		}, cardinality: 1}]
-            		},
-            	't': { //am/pm
-                	validator: function(chrs, buffer, pos, strict, opts) {
-                    	var isValid = opts.regex.ampm.test(chrs);
-                    	if (!strict && !isValid) {
-                        	isValid = opts.regex.ampm.test(chrs+'m');
-                        	if (isValid) {
-                            	buffer[pos - 1] = chrs.charAt(0);
-                            	buffer[pos] = "m";
-                            	pos++;
-                            	return pos;
-                        	}
-                    	}
-                    	return isValid;
-                	},
-                	casing: "lower",
-                	cardinality: 2,
-                	prevalidator: [{ validator: function(chrs, buffer, pos, strict, opts) {
-                    	var isValid = opts.regex.ampmpre.test(chrs);
-                    	if (isValid) {
-                        	isValid = opts.regex.ampm.test(chrs+"m");
-                        	if (isValid) {
-                            	buffer[pos] = chrs;
-                            	buffer[pos+1] = 'm';
-                            	return pos;
-                        	}
-                    	}
-                    	return isValid;
-                					}, cardinality: 1}]
-            					}
-        					},
-        				insertMode: false,
-        				autoUnmask: false
-    				},
-    				'datetime12': {
-    					mask: "1/2/y h:s t",
-                        placeholder: "dd/mm/yyyy hh:mm xm",
-                        alias: "datetime",
-        				hourFormat: "12"
-    				}, 
-    				'hh:mm t': {
-    					mask: "h:s t",
-                        placeholder: "hh:mm xm",
-                        alias: "datetime",
-        				hourFormat: "12"
-    				}, 
-    				'h:s t': {
-        				mask: "h:s t",
-        				placeholder: "hh:mm xm",
-        				alias: "datetime",
-        				hourFormat: "12"
-       				 },
-                    'hh:mm:ss': {
-                        mask: "h:s:s",
-                        autoUnmask: false
+                        return isValid;
                     },
-                    'hh:mm': {
-                        mask: "h:s",
-                        autoUnmask: false
+                    cardinality: 2,
+                    prevalidator: [{
+                        validator: function (chrs, buffer, pos, strict, opts) {
+                            var isValid = opts.regex.hrspre.test(chrs);
+                            if (!strict && !isValid) {
+                                isValid = opts.regex.hrs.test("0" + chrs);
+                                if (isValid) {
+                                    buffer[pos] = "0";
+                                    pos++;
+                                    return { "pos": pos };
+                                }
+                            }
+                            return isValid;
+                        }, cardinality: 1
+                    }]
+                },
+                't': { //am/pm
+                    validator: function (chrs, buffer, pos, strict, opts) {
+                        var isValid = opts.regex.ampm.test(chrs);
+                        if (!strict && !isValid) {
+                            isValid = opts.regex.ampm.test(chrs + 'm');
+                            if (isValid) {
+                                buffer[pos - 1] = chrs.charAt(0);
+                                buffer[pos] = "m";
+                                pos++;
+                                return pos;
+                            }
+                        }
+                        return isValid;
                     },
-                    'date': {
-                        alias: "dd/mm/yyyy" // "mm/dd/yyyy"
-                    }
-                });
-            })(jQuery);
+                    casing: "lower",
+                    cardinality: 2,
+                    prevalidator: [{
+                        validator: function (chrs, buffer, pos, strict, opts) {
+                            var isValid = opts.regex.ampmpre.test(chrs);
+                            if (isValid) {
+                                isValid = opts.regex.ampm.test(chrs + "m");
+                                if (isValid) {
+                                    buffer[pos] = chrs;
+                                    buffer[pos + 1] = 'm';
+                                    return pos;
+                                }
+                            }
+                            return isValid;
+                        }, cardinality: 1
+                    }]
+                }
+            },
+            insertMode: false,
+            autoUnmask: false
+        },
+        'datetime12': {
+            mask: "1/2/y h:s t",
+            placeholder: "dd/mm/yyyy hh:mm xm",
+            alias: "datetime",
+            hourFormat: "12"
+        },
+        'hh:mm t': {
+            mask: "h:s t",
+            placeholder: "hh:mm xm",
+            alias: "datetime",
+            hourFormat: "12"
+        },
+        'h:s t': {
+            mask: "h:s t",
+            placeholder: "hh:mm xm",
+            alias: "datetime",
+            hourFormat: "12"
+        },
+        'hh:mm:ss': {
+            mask: "h:s:s",
+            autoUnmask: false
+        },
+        'hh:mm': {
+            mask: "h:s",
+            autoUnmask: false
+        },
+        'date': {
+            alias: "dd/mm/yyyy" // "mm/dd/yyyy"
+        }
+    });
+})(jQuery);

+ 3 - 3
js/jquery.inputmask.js

@@ -536,7 +536,7 @@
             }
 
             function caret(input, begin, end) {
-				if (!$(input).is(':visible')) {
+                if (!$(input).is(':visible')) {
                     return;
                 }
                 var npt = input.jquery && input.length > 0 ? input[0] : input;
@@ -970,7 +970,7 @@
                         }
                     }
 
-                    opts.onKeyDown.call(this, e, opts); //extra stuff to execute on keydown
+                    opts.onKeyDown.call(this, e, buffer, opts); //extra stuff to execute on keydown
                     ignorable = $.inArray(k, opts.ignorables) != -1;
                 }
 
@@ -1073,7 +1073,7 @@
                 function keyupEvent(e) {
                     var $input = $(this), input = this;
                     var k = e.keyCode;
-                    opts.onKeyUp.call(this, e, opts); //extra stuff to execute on keyup
+                    opts.onKeyUp.call(this, e, buffer, opts); //extra stuff to execute on keyup
                     if (k == opts.keyCode.TAB && $input.hasClass('focus.inputmask') && input._valueGet().length == 0 && opts.showMaskOnFocus) {
                         buffer = _buffer.slice();
                         writeBuffer(input, buffer);

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

@@ -27,12 +27,11 @@ Optional extensions on the jquery.inputmask base
                 var bufVal = cbuf.join('');
                 if (opts.autoGroup || (reformatOnly && bufVal.indexOf(opts.groupSeparator) != -1)) {
                     bufVal = bufVal.replace(new RegExp("\\" + opts.groupSeparator, "g"), '');
-                    
                     var reg = new RegExp('([-\+]?[\\d\?]+)([\\d\?]{' + opts.groupSize + '})');
                     while (reg.test(bufVal)) {
                         bufVal = bufVal.replace(reg, '$1' + opts.groupSeparator + '$2');
+                        bufVal = bufVal.replace(opts.groupSeparator + opts.groupSeparator, opts.groupSeparator);
                     }
-                    
                 }
                 buffer.length = bufVal.length; //align the length
                 for (var i = 0, l = bufVal.length; i < l; i++) {
@@ -51,7 +50,7 @@ Optional extensions on the jquery.inputmask base
                     return new RegExp("^[\+-]?(\\d+|\\d{1," + groupSize + "}((" + escapedGroupSeparator + "\\d{" + groupSize + "})?)+)(" + escapedRadixPoint + "\\d" + digitExpression + ")?$");
                 }
             },
-            onKeyDown: function (e, opts) {
+            onKeyDown: function (e, buffer, opts) {
                 var $input = $(this), input = this;
                 if (e.keyCode == opts.keyCode.TAB) {
                     var nptStr = input._valueGet();
@@ -65,11 +64,8 @@ Optional extensions on the jquery.inputmask base
                         }
                     }
                 } else if (e.keyCode == opts.keyCode.DELETE || e.keyCode == opts.keyCode.BACKSPACE) {
-                    var nptStr = input._valueGet(),
-                    buffer = nptStr.split('');
-                    var newPos = opts.postFormat(buffer, 0, true, opts);
-                    nptStr = buffer.join('');
-                    input._valueSet(nptStr);
+                    opts.postFormat(buffer, 0, true, opts);
+                    input._valueSet(buffer.join(''));
                 }
             },
             definitions: {
@@ -114,7 +110,7 @@ Optional extensions on the jquery.inputmask base
                         }
 
                         if (isValid != false && !strict) {
-                            var newPos = opts.postFormat(buffer, pos, false, opts);
+                            var newPos = opts.postFormat(buffer, pos + 1, false, opts);
                             return { "pos": newPos };
                         }
                         return isValid;