aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott González <scott.gonzalez@gmail.com>2011-08-09 08:27:04 -0400
committerScott González <scott.gonzalez@gmail.com>2011-08-09 08:27:04 -0400
commit3e98e737725ef247b765406330dfadf9e28ee049 (patch)
tree0e11717c4e1f759554fc918686e3dbfc636bb039
parent66d6766dad15eb3fc429f92925d0a61f1900850c (diff)
downloadjquery-ui-3e98e737725ef247b765406330dfadf9e28ee049.tar.gz
jquery-ui-3e98e737725ef247b765406330dfadf9e28ee049.zip
Revert "Datepicker: Added onSelect.apply() call to _setDate method if onSelect is defined. Fixed #6264 - Datepicker: onSelect does not fire when setDate is called"
This reverts commit b8e14e79e5bc630bf459137896c08fc37936f52f.
-rw-r--r--tests/unit/datepicker/datepicker_options.js10
-rw-r--r--ui/jquery.ui.datepicker.js8
2 files changed, 0 insertions, 18 deletions
diff --git a/tests/unit/datepicker/datepicker_options.js b/tests/unit/datepicker/datepicker_options.js
index 15005c8be..e863b5362 100644
--- a/tests/unit/datepicker/datepicker_options.js
+++ b/tests/unit/datepicker/datepicker_options.js
@@ -474,16 +474,6 @@ 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 00ce5850d..df6bdd419 100644
--- a/ui/jquery.ui.datepicker.js
+++ b/ui/jquery.ui.datepicker.js
@@ -1384,14 +1384,6 @@ $.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. */