bug fix - swallowing all date parsing errors breaks the datepicker option "defaultDate" on relative values like "-18y"

This commit is contained in:
Richard Bradley 2011-12-15 15:30:22 +00:00
parent 3ac151fe8c
commit 8e456626c7

View file

@ -1207,10 +1207,15 @@ $.datepicker.parseDate = function(format, value, settings) {
try { try {
date = this._base_parseDate(format, value, settings); date = this._base_parseDate(format, value, settings);
} catch (err) { } catch (err) {
if (err.indexOf(":") >= 0) {
// Hack! The error message ends with a colon, a space, and // Hack! The error message ends with a colon, a space, and
// the "extra" characters. We rely on that instead of // the "extra" characters. We rely on that instead of
// attempting to perfectly reproduce the parsing algorithm. // attempting to perfectly reproduce the parsing algorithm.
date = this._base_parseDate(format, value.substring(0,value.length-(err.length-err.indexOf(':')-2)), settings); date = this._base_parseDate(format, value.substring(0,value.length-(err.length-err.indexOf(':')-2)), settings);
} else {
// The underlying error was not related to the time
throw err;
}
} }
return date; return date;
}; };