parseDate fails when dateFormat contains separator

When the dateFormat contains the separator that is used to split date and time, parseDate fails.
Also, since parseDate has no access to the instance, it does not know the correct timeFormat, so splitting is not always correct. 
Restoring the old hack of relying on datepickers error message seems to fix these issues.

1 files changed, 10 insertions, 2 deletions

diff --git a/jquery-ui-timepicker-addon.js b/jquery-ui-timepicker-addon.js
index fa2b2c0..8872d77 100644
--- a/jquery-ui-timepicker-addon.js
+++ b/jquery-ui-timepicker-addon.js
@@ -1425,8 +1425,16 @@
 	*/
 	$.datepicker._base_parseDate = $.datepicker.parseDate;
 	$.datepicker.parseDate = function(format, value, settings) {
-		var splitRes = splitDateTime(format, value, settings);
-		return $.datepicker._base_parseDate(format, splitRes[0], settings);
+		var date;
+		try {
+			date = this._base_parseDate(format, value, settings);
+		} catch (err) {
+			// Hack!  The error message ends with a colon, a space, and
+			// the "extra" characters.  We rely on that instead of
+			// attempting to perfectly reproduce the parsing algorithm.
+			date = this._base_parseDate(format, value.substring(0,value.length-(err.length-err.indexOf(':')-2)), settings);
+		}
+		return date;
 	};
 
 	/*