Skip to content

Commit 1b9f726

Browse files
Fixes bug hourMin/Max defaults the input before setting a time
1 parent 6741308 commit 1b9f726

File tree

1 file changed

+8
-9
lines changed

1 file changed

+8
-9
lines changed

jquery-ui-timepicker-addon.js

+8-9
Original file line numberDiff line numberDiff line change
@@ -237,10 +237,14 @@
237237
}
238238

239239
tp_inst.timezone = tp_inst._defaults.timezone;
240-
tp_inst.hour = tp_inst._defaults.hour;
241-
tp_inst.minute = tp_inst._defaults.minute;
242-
tp_inst.second = tp_inst._defaults.second;
243-
tp_inst.millisec = tp_inst._defaults.millisec;
240+
tp_inst.hour = tp_inst._defaults.hour < tp_inst._defaults.hourMin? tp_inst._defaults.hourMin :
241+
tp_inst._defaults.hour > tp_inst._defaults.hourMax? tp_inst._defaults.hourMax : tp_inst._defaults.hour;
242+
tp_inst.minute = tp_inst._defaults.minute < tp_inst._defaults.minuteMin? tp_inst._defaults.minuteMin :
243+
tp_inst._defaults.minute > tp_inst._defaults.minuteMax? tp_inst._defaults.minuteMax : tp_inst._defaults.minute;
244+
tp_inst.second = tp_inst._defaults.second < tp_inst._defaults.secondMin? tp_inst._defaults.secondMin :
245+
tp_inst._defaults.second > tp_inst._defaults.secondMax? tp_inst._defaults.secondMax : tp_inst._defaults.second;
246+
tp_inst.millisec = tp_inst._defaults.millisec < tp_inst._defaults.millisecMin? tp_inst._defaults.millisecMin :
247+
tp_inst._defaults.millisec > tp_inst._defaults.millisecMax? tp_inst._defaults.millisecMax : tp_inst._defaults.millisec;
244248
tp_inst.ampm = '';
245249
tp_inst.$input = $input;
246250

@@ -396,11 +400,6 @@
396400
for(var i=0,l=tp_inst.units.length; i<l; i++){
397401
litem = tp_inst.units[i];
398402
uitem = litem.substr(0,1).toUpperCase() + litem.substr(1);
399-
400-
if(tp_inst[litem] < o[litem+'Min'])
401-
tp_inst[litem] = o[litem+'Min'];
402-
else if(tp_inst[litem] > max[litem])
403-
tp_inst[litem] = max[litem];
404403

405404
// add the slider
406405
tp_inst[litem+'_slider'] = tp_inst.control.create(tp_inst, $tp.find('.ui_tpicker_'+litem+'_slider'), litem, tp_inst[litem], o[litem+'Min'], max[litem], o['step'+uitem]);

0 commit comments

Comments
 (0)