Merges trentrichardson#772 - Fixes using current time as minimum when setting minDateTime=0

trentrichardson · trentrichardson · commit a31d56d6c92a · 2015-02-10T08:06:35.000-05:00
diff --git 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');

Original file line number	Diff line number	Diff line change
`@@ -1071,7 +1071,7 @@`
`1071`	`1071`	`o[opts] = val;`
`1072`	`1072`	`}`
`1073`	`1073`	`else { o = opts; }`
`1074`		`- 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'));`
	`1074`	`+ 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'));`
`1075`	`1075`	`},`
`1076`	`1076`	`value: function (tp_inst, obj, unit, val) {`
`1077`	`1077`	`var $t = obj.children('select');`