summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTrent Richardson <trentdrichardson@gmail.com>2010-11-30 14:47:45 -0500
committerTrent Richardson <trentdrichardson@gmail.com>2010-11-30 14:47:45 -0500
commit93d598238d75dec320f3140ae1e1458c8ea8fd82 (patch)
tree759054312dd631d24933e1e3edbdc1accf1692e2
parent21c03b3477b2e80fa3b6db0a0d8c5e12a6095ed6 (diff)
parent3266d91cd90e5c328c6a4684671dc3fc13d3e16b (diff)
downloadjQuery-Timepicker-Addon-93d598238d75dec320f3140ae1e1458c8ea8fd82.zip
jQuery-Timepicker-Addon-93d598238d75dec320f3140ae1e1458c8ea8fd82.tar.gz
jQuery-Timepicker-Addon-93d598238d75dec320f3140ae1e1458c8ea8fd82.tar.bz2
Merge branch 'DuctTapeMan-master' into dev
-rw-r--r--jquery-ui-timepicker-addon.js6
1 files changed, 3 insertions, 3 deletions
diff --git a/jquery-ui-timepicker-addon.js b/jquery-ui-timepicker-addon.js
index 539c4bc..1ce86e4 100644
--- a/jquery-ui-timepicker-addon.js
+++ b/jquery-ui-timepicker-addon.js
@@ -220,9 +220,9 @@ $.extend(Timepicker.prototype, {
// Added by Peter Medeiros:
// - Figure out what the hour/minute/second max should be based on the step values.
// - Example: if stepMinute is 15, then minMax is 45.
- hourMax = o.hourMax - (o.hourMax % o.stepHour),
- minMax = o.minuteMax - (o.minuteMax % o.stepMinute),
- secMax = o.secondMax - (o.secondMax % o.stepSecond),
+ hourMax = (o.hourMax - (o.hourMax % o.stepHour)).toFixed(0),
+ minMax = (o.minuteMax - (o.minuteMax % o.stepMinute)).toFixed(0),
+ secMax = (o.secondMax - (o.secondMax % o.stepSecond)).toFixed(0),
dp_id = this.inst.id.toString().replace(/([^A-Za-z0-9_])/g, '');
// Prevent displaying twice