diff options
| author | doublerebel <charles@doublerebel.com> | 2010-11-20 17:24:03 -0800 |
|---|---|---|
| committer | doublerebel <charles@doublerebel.com> | 2010-11-20 17:30:02 -0800 |
| commit | 95a6ef2f4451a395ef6bf1df4f90e2f16dea811f (patch) | |
| tree | 905bfa49e152a94d8c3c1cfcbc77bac82df4a743 /jquery-ui-timepicker-addon.js | |
| parent | ba7074fba1fe6f37ecfe378943ffc47511c6de64 (diff) | |
| download | jQuery-Timepicker-Addon-95a6ef2f4451a395ef6bf1df4f90e2f16dea811f.zip jQuery-Timepicker-Addon-95a6ef2f4451a395ef6bf1df4f90e2f16dea811f.tar.gz jQuery-Timepicker-Addon-95a6ef2f4451a395ef6bf1df4f90e2f16dea811f.tar.bz2 | |
Changed _doKeyPress to limit input characters correctly
based on timeFormat + a space + dateFormat
(now restricts am/pm correctly based on timeFormat)
Diffstat (limited to 'jquery-ui-timepicker-addon.js')
| -rw-r--r-- | jquery-ui-timepicker-addon.js | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/jquery-ui-timepicker-addon.js b/jquery-ui-timepicker-addon.js index b760340..75f0825 100644 --- a/jquery-ui-timepicker-addon.js +++ b/jquery-ui-timepicker-addon.js @@ -608,9 +608,14 @@ $.datepicker._doKeyPress = function(event) { if (tp_inst) { if ($.datepicker._get(inst, 'constrainInput')) { - var datetimeChars = $.datepicker._possibleChars($.datepicker._get(inst, 'dateFormat')) + "aAmMpP :", + var datetimeChars = tp_inst._defaults.timeFormat.toString() + .replace(/[hms]/g, '') + .replace(/TT|T/g, 'APM') + .replace(/tt|t/g, 'apm') + + " " + + $.datepicker._possibleChars($.datepicker._get(inst, 'dateFormat')), chr = String.fromCharCode(event.charCode === undefined ? event.keyCode : event.charCode); - return event.ctrlKey || (chr < ' ' || !dateChars || dateChars.indexOf(chr) > -1); + return event.ctrlKey || (chr < ' ' || !datetimeChars || datetimeChars.indexOf(chr) > -1); } } else return $.datepicker._base_doKeyPress(event); |