Permalink
Browse files

Datepicker: Proper handling of empty strings for dates.

  • Loading branch information...
scottgonzalez committed Nov 22, 2010
1 parent 7b523c2 commit 9ade71071a54fba328a429e608757e8d984b052e
Showing with 3 additions and 6 deletions.
  1. +3 −6 ui/jquery.ui.datepicker.js
@@ -1316,7 +1316,7 @@ $.extend(Datepicker.prototype, {
}
return new Date(year, month, day);
};
- var newDate = (date == null ? defaultDate : (typeof date == 'string' ? offsetString(date) :
+ var newDate = (date == null || date === '' ? defaultDate : (typeof date == 'string' ? offsetString(date) :
(typeof date == 'number' ? (isNaN(date) ? defaultDate : offsetNumeric(date)) : new Date(date.getTime()))));
newDate = (newDate && newDate.toString() == 'Invalid Date' ? defaultDate : newDate);
if (newDate) {
@@ -1342,10 +1342,7 @@ $.extend(Datepicker.prototype, {
/* Set the date(s) directly. */
_setDate: function(inst, date, noChange) {
- if ( !date ) {
- inst.input.val( "" );
- return;
- }
+ var clear = !date;
var origMonth = inst.selectedMonth;
var origYear = inst.selectedYear;
var newDate = this._restrictMinMax(inst, this._determineDate(inst, date, new Date()));
@@ -1356,7 +1353,7 @@ $.extend(Datepicker.prototype, {
this._notifyChange(inst);
this._adjustInstDate(inst);
if (inst.input) {
- inst.input.val(this._formatDate(inst));
+ inst.input.val(clear ? '' : this._formatDate(inst));
}
},

0 comments on commit 9ade710

Please sign in to comment.