From: marcneuwirth <marc.neuwirth@gmail.com>
Date: Tue, 28 Jun 2011 15:59:08 +0000 (-0500)
Subject: Datepicker: Added onSelect.apply() call to _setDate method if onSelect is defined... 
X-Git-Tag: 1.8.15~14
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=b8e14e79e5bc630bf459137896c08fc37936f52f;p=jquery-ui.git

Datepicker: Added onSelect.apply() call to _setDate method if onSelect is defined. Fixed #6264 - Datepicker: onSelect does not fire when setDate is called
(cherry picked from commit effdd5d19c534f8445ebafe4212278c4366b0041)
---

diff --git a/tests/unit/datepicker/datepicker_options.js b/tests/unit/datepicker/datepicker_options.js
index b14c87b8b..a6d4b8fbc 100644
--- a/tests/unit/datepicker/datepicker_options.js
+++ b/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() {
diff --git a/ui/jquery.ui.datepicker.js b/ui/jquery.ui.datepicker.js
index 458ad01ec..3f3e73a70 100644
--- a/ui/jquery.ui.datepicker.js
+++ b/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. */