Skip to content

Commit 670983c

Browse files
Merge pull request trentrichardson#452 from NetForce1/patch-1
fix splitDateTime for plain datepicker
2 parents 20ec8cf + b0b8458 commit 670983c

File tree

1 file changed

+11
-3
lines changed

1 file changed

+11
-3
lines changed

jquery-ui-timepicker-addon.js

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1425,8 +1425,16 @@
14251425
*/
14261426
$.datepicker._base_parseDate = $.datepicker.parseDate;
14271427
$.datepicker.parseDate = function(format, value, settings) {
1428-
var splitRes = splitDateTime(format, value, settings);
1429-
return $.datepicker._base_parseDate(format, splitRes[0], settings);
1428+
var date;
1429+
try {
1430+
date = this._base_parseDate(format, value, settings);
1431+
} catch (err) {
1432+
// Hack! The error message ends with a colon, a space, and
1433+
// the "extra" characters. We rely on that instead of
1434+
// attempting to perfectly reproduce the parsing algorithm.
1435+
date = this._base_parseDate(format, value.substring(0,value.length-(err.length-err.indexOf(':')-2)), settings);
1436+
}
1437+
return date;
14301438
};
14311439

14321440
/*
@@ -1551,7 +1559,7 @@
15511559
timePartsLen = timeParts.length;
15521560
}
15531561

1554-
if (allPartsLen > 0) {
1562+
if (allPartsLen > 1) {
15551563
return [
15561564
allParts.splice(0,allPartsLen-timePartsLen).join(separator),
15571565
allParts.splice(0,timePartsLen).join(separator)

0 commit comments

Comments
 (0)