summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTrent Richardson <trentdrichardson@gmail.com>2010-12-20 08:39:11 -0500
committerTrent Richardson <trentdrichardson@gmail.com>2010-12-20 08:39:11 -0500
commit3d53741ca47060117230fe7baee272b70ec37c03 (patch)
treedce745ced694228b0d43645cc7fcaecf866190e9
parentc6f5819f138384c77276e54c00fefffc53c315e6 (diff)
downloadjQuery-Timepicker-Addon-3d53741ca47060117230fe7baee272b70ec37c03.zip
jQuery-Timepicker-Addon-3d53741ca47060117230fe7baee272b70ec37c03.tar.gz
jQuery-Timepicker-Addon-3d53741ca47060117230fe7baee272b70ec37c03.tar.bz2
Add fix by doublerebel to determine ampm inside onTimeChnage
-rw-r--r--jquery-ui-timepicker-addon.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/jquery-ui-timepicker-addon.js b/jquery-ui-timepicker-addon.js
index 2b3d3a1..4db2552 100644
--- a/jquery-ui-timepicker-addon.js
+++ b/jquery-ui-timepicker-addon.js
@@ -535,7 +535,7 @@ $.extend(Timepicker.prototype, {
if (hour) {
this.hour = parseFloat(hour).toFixed(0);
- this.ampm = ampm;
+ if (this._defaults.ampm) this.ampm = ampm;
}
if (minute) this.minute = parseFloat(minute).toFixed(0);
if (second) this.second = parseFloat(second).toFixed(0);