summaryrefslogtreecommitdiffstats
path: root/src/jquery-ui-timepicker-addon.js
diff options
context:
space:
mode:
authorTrent Richardson <trentdrichardson@gmail.com>2015-02-10 08:06:35 -0500
committerTrent Richardson <trentdrichardson@gmail.com>2015-02-10 08:06:35 -0500
commita31d56d6c92a2cba27e4021dfc9bdbcac78baea2 (patch)
treea2434645478b707c4d5bc7aee827cbe3f2208397 /src/jquery-ui-timepicker-addon.js
parent4edb868f91cffa8c301e7b8939f82fb5cd8ebad9 (diff)
downloadjQuery-Timepicker-Addon-a31d56d6c92a2cba27e4021dfc9bdbcac78baea2.zip
jQuery-Timepicker-Addon-a31d56d6c92a2cba27e4021dfc9bdbcac78baea2.tar.gz
jQuery-Timepicker-Addon-a31d56d6c92a2cba27e4021dfc9bdbcac78baea2.tar.bz2
Merges #772 - Fixes using current time as minimum when setting minDateTime=0
Diffstat (limited to 'src/jquery-ui-timepicker-addon.js')
-rw-r--r--src/jquery-ui-timepicker-addon.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/jquery-ui-timepicker-addon.js b/src/jquery-ui-timepicker-addon.js
index 4c89bfd..1c00dc7 100644
--- a/src/jquery-ui-timepicker-addon.js
+++ b/src/jquery-ui-timepicker-addon.js
@@ -1071,7 +1071,7 @@
o[opts] = val;
}
else { o = opts; }
- return tp_inst.control.create(tp_inst, obj, $t.data('unit'), $t.val(), o.min || $t.data('min'), o.max || $t.data('max'), o.step || $t.data('step'));
+ return tp_inst.control.create(tp_inst, obj, $t.data('unit'), $t.val(), o.min>=0 ? o.min : $t.data('min'), o.max || $t.data('max'), o.step || $t.data('step'));
},
value: function (tp_inst, obj, unit, val) {
var $t = obj.children('select');