Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Datepicker: Added onSelect.apply() call to _setDate method if onSelec…

…t is defined. Fixed #6264 - Datepicker: onSelect does not fire when setDate is called

(cherry picked from commit effdd5d)
  • Loading branch information...
commit b8e14e79e5bc630bf459137896c08fc37936f52f 1 parent bb9f9fa
@marcneuwirth marcneuwirth authored gnarf committed
View
10 tests/unit/datepicker/datepicker_options.js
@@ -474,6 +474,16 @@ test('setDate', function() {
var dateAndTimeClone = new Date(2008, 3 - 1, 28, 1, 11, 0);
inp.datepicker('setDate', dateAndTimeToSet);
equals(dateAndTimeToSet.getTime(), dateAndTimeClone.getTime(), 'Date object passed should not be changed by setDate');
+ // Test onSelect callback is executed when using setDate
+ inp.datepicker('destroy');
+ var testDate = null;
+ inp.datepicker({
+ onSelect: function(dateText, inst) {
+ testDate = new Date(dateText);
+ }
+ });
+ inp.datepicker('setDate', date2);
+ equals(date2.getTime(), testDate.getTime(), 'onSelect is called after setDate');
});
test('altField', function() {
View
8 ui/jquery.ui.datepicker.js
@@ -1386,6 +1386,14 @@ $.extend(Datepicker.prototype, {
if (inst.input) {
inst.input.val(clear ? '' : this._formatDate(inst));
}
+
+ var onSelect = this._get(inst, 'onSelect');
+ if (onSelect) {
+ var dateStr = this._formatDate(inst);
+
+ // trigger custom callback
+ onSelect.apply((inst.input ? inst.input[0] : null), [dateStr, inst]);
+ }
},
/* Retrieve the date(s) directly. */
Please sign in to comment.
Something went wrong with that request. Please try again.