Skip to content

Commit f8cdfde

Browse files
Fixed get/setDate when picker initiated with selector of multiple fields
1 parent 454af7b commit f8cdfde

File tree

1 file changed

+11
-5
lines changed

1 file changed

+11
-5
lines changed

jquery-ui-timepicker-addon.js

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -564,7 +564,8 @@ $.fn.extend({
564564
}
565565
else
566566
return this.each(function() {
567-
$(this).datepicker($.timepicker._newInst($input, o)._defaults);
567+
var $t = $(this);
568+
$t.datepicker($.timepicker._newInst($t, o)._defaults);
568569
});
569570
}
570571
});
@@ -597,7 +598,8 @@ $.datepicker._updateDatepicker = function(inst) {
597598
if (typeof(inst.stay_open) !== 'boolean' || inst.stay_open === false) {
598599
this._base_updateDatepicker(inst);
599600
// Reload the time control when changing something in the input text field.
600-
this._get(inst, 'timepicker')._addTimePicker();
601+
var tp_inst = this._get(inst, 'timepicker');
602+
if(tp_inst) tp_inst._addTimePicker();
601603
}
602604
};
603605

@@ -685,7 +687,7 @@ $.datepicker._setTime = function(inst, date) {
685687
else tp_inst.second = second;
686688

687689
tp_inst._onTimeChange();
688-
tp_inst._updateDateTime(inst);
690+
//tp_inst._updateDateTime(inst);
689691
}
690692
};
691693

@@ -718,8 +720,12 @@ $.datepicker._setTimeDatepicker = function(target, date, withDate) {
718720
//#######################################################################################
719721
$.datepicker._base_setDateDatepicker = $.datepicker._setDateDatepicker;
720722
$.datepicker._setDateDatepicker = function(target, date) {
723+
var inst = this._getInst(target),
724+
tp_date = !!date ? new Date(date.getTime()) : date;
725+
726+
this._updateDatepicker(inst);
721727
this._base_setDateDatepicker.apply(this, arguments);
722-
this._setTimeDatepicker(target, date, true);
728+
this._setTimeDatepicker(target, tp_date, true);
723729
};
724730

725731
//#######################################################################################
@@ -736,7 +742,7 @@ $.datepicker._getDateDatepicker = function(target, noDefault) {
736742
if (date && tp_inst._parseTime($(target).val(), true)) date.setHours(tp_inst.hour, tp_inst.minute, tp_inst.second);
737743
return date;
738744
}
739-
else return this._base_getDateDatepicker(inst);
745+
else return this._base_getDateDatepicker(target, noDefault);
740746
};
741747

742748
//#######################################################################################

0 commit comments

Comments
 (0)