Skip to content

Commit effdd5d

Browse files
marcneuwirthgnarf
authored andcommitted
Datepicker: Added onSelect.apply() call to _setDate method if onSelect is defined. Fixed #6264 - Datepicker: onSelect does not fire when setDate is called
1 parent a56aa86 commit effdd5d

File tree

2 files changed

+18
-0
lines changed

2 files changed

+18
-0
lines changed

tests/unit/datepicker/datepicker_options.js

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -469,6 +469,16 @@ test('setDate', function() {
469469
var dateAndTimeClone = new Date(2008, 3 - 1, 28, 1, 11, 0);
470470
inp.datepicker('setDate', dateAndTimeToSet);
471471
equals(dateAndTimeToSet.getTime(), dateAndTimeClone.getTime(), 'Date object passed should not be changed by setDate');
472+
// Test onSelect callback is executed when using setDate
473+
inp.datepicker('destroy');
474+
var testDate = null;
475+
inp.datepicker({
476+
onSelect: function(dateText, inst) {
477+
testDate = new Date(dateText);
478+
}
479+
});
480+
inp.datepicker('setDate', date2);
481+
equals(date2.getTime(), testDate.getTime(), 'onSelect is called after setDate');
472482
});
473483

474484
test('altField', function() {

ui/jquery.ui.datepicker.js

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1399,6 +1399,14 @@ $.extend(Datepicker.prototype, {
13991399
if (inst.input) {
14001400
inst.input.val(clear ? '' : this._formatDate(inst));
14011401
}
1402+
1403+
var onSelect = this._get(inst, 'onSelect');
1404+
if (onSelect) {
1405+
var dateStr = this._formatDate(inst);
1406+
1407+
// trigger custom callback
1408+
onSelect.apply((inst.input ? inst.input[0] : null), [dateStr, inst]);
1409+
}
14021410
},
14031411

14041412
/* Retrieve the date(s) directly. */

0 commit comments

Comments
 (0)