summaryrefslogtreecommitdiffstats
path: root/jquery-ui-timepicker-addon.js
diff options
context:
space:
mode:
authorTrent Richardson <trentdrichardson@gmail.com>2010-10-01 08:03:59 -0400
committerTrent Richardson <trentdrichardson@gmail.com>2010-10-01 08:03:59 -0400
commit6e55e5fc6a75fdde6b4a0b97561b6a6d8356ad4d (patch)
tree03af6c34baac96d2fb0bb434d6111d99199be6c3 /jquery-ui-timepicker-addon.js
parent0851f323a9763394a5934217d36c9301667fa8c5 (diff)
downloadjQuery-Timepicker-Addon-6e55e5fc6a75fdde6b4a0b97561b6a6d8356ad4d.zip
jQuery-Timepicker-Addon-6e55e5fc6a75fdde6b4a0b97561b6a6d8356ad4d.tar.gz
jQuery-Timepicker-Addon-6e55e5fc6a75fdde6b4a0b97561b6a6d8356ad4d.tar.bz2
fixed 12am display bug
Diffstat (limited to 'jquery-ui-timepicker-addon.js')
-rwxr-xr-xjquery-ui-timepicker-addon.js8
1 files changed, 4 insertions, 4 deletions
diff --git a/jquery-ui-timepicker-addon.js b/jquery-ui-timepicker-addon.js
index 94eb2c3..f4862e8 100755
--- a/jquery-ui-timepicker-addon.js
+++ b/jquery-ui-timepicker-addon.js
@@ -1,8 +1,8 @@
/*
* jQuery timepicker addon
* By: Trent Richardson [http://trentrichardson.com]
-* Version 0.6.2
-* Last Modified: 9/26/2010
+* Version 0.6.3
+* Last Modified: 10/1/2010
*
* Copyright 2010 Trent Richardson
* Dual licensed under the MIT and GPL licenses.
@@ -278,7 +278,7 @@
formatTime: function(tp_inst) {
var tmptime = tp_inst.defaults.timeFormat.toString();
var hour12 = ((tp_inst.ampm == 'AM') ? (tp_inst.hour) : (tp_inst.hour % 12));
- hour12 = (hour12 === 0) ? 12 : hour12;
+ hour12 = (Number(hour12) === 0) ? 12 : hour12;
if (tp_inst.defaults.ampm === true) {
tmptime = tmptime.toString()
@@ -469,7 +469,7 @@
var chrl = chr.toLowerCase();
// keyCode == 58 => ":"
// keyCode == 32 => " "
- return event.ctrlKey || (chr < ' ' || !dateChars || dateChars.indexOf(chr) > -1 || event.keyCode == 58 || event.keyCode == 32 || chr == ':' || chr == ' ' || chrl == 'a' || chrl == 'p' || charl == 'm');
+ return event.ctrlKey || (chr < ' ' || !dateChars || dateChars.indexOf(chr) > -1 || event.keyCode == 58 || event.keyCode == 32 || chr == ':' || chr == ' ' || chrl == 'a' || chrl == 'p' || chrl == 'm');
}
}
else{