From 7b523c2ec144fb0f4e39ad1c593453058fd3fb3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Scott=20Gonz=C3=A1lez?= Date: Mon, 22 Nov 2010 11:46:36 -0500 Subject: [PATCH] Datepicker: Handle clearing the date inside _setDate() as early as possible. Fixes #6684 - Datepicker: setDate() should accept an empty string. Thanks RobinHerbots. --- ui/jquery.ui.datepicker.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/ui/jquery.ui.datepicker.js b/ui/jquery.ui.datepicker.js index 4ba478903..687ed2b05 100644 --- a/ui/jquery.ui.datepicker.js +++ b/ui/jquery.ui.datepicker.js @@ -1342,7 +1342,10 @@ $.extend(Datepicker.prototype, { /* Set the date(s) directly. */ _setDate: function(inst, date, noChange) { - var clear = !(date); + if ( !date ) { + inst.input.val( "" ); + return; + } var origMonth = inst.selectedMonth; var origYear = inst.selectedYear; var newDate = this._restrictMinMax(inst, this._determineDate(inst, date, new Date())); @@ -1353,7 +1356,7 @@ $.extend(Datepicker.prototype, { this._notifyChange(inst); this._adjustInstDate(inst); if (inst.input) { - inst.input.val(clear ? '' : this._formatDate(inst)); + inst.input.val(this._formatDate(inst)); } },