diff options
Diffstat (limited to 'jquery-ui-timepicker-addon.js')
| -rw-r--r-- | jquery-ui-timepicker-addon.js | 32 |
1 files changed, 19 insertions, 13 deletions
diff --git a/jquery-ui-timepicker-addon.js b/jquery-ui-timepicker-addon.js index 3753b82..9f11849 100644 --- a/jquery-ui-timepicker-addon.js +++ b/jquery-ui-timepicker-addon.js @@ -1877,25 +1877,31 @@ * timeObj = {hour: , minute: , second: , millisec: , microsec: } - parsed time. Optional */ var parseDateTimeInternal = function(dateFormat, timeFormat, dateTimeString, dateSettings, timeSettings) { - var date; - var splitRes = splitDateTime(dateFormat, dateTimeString, dateSettings, timeSettings); + var date, + splitRes, + timeString, + parsedTime; + + splitRes = splitDateTime(dateFormat, dateTimeString, dateSettings, timeSettings); date = $.datepicker._base_parseDate(dateFormat, splitRes[0], dateSettings); - if (splitRes[1] !== '') { - var timeString = splitRes[1], - parsedTime = $.datepicker.parseTime(timeFormat, timeString, timeSettings); + timeString = splitRes[1]; - if (!parsedTime) { - throw 'Wrong time format'; - } - return { - date: date, - timeObj: parsedTime - }; - } else { + if (timeString === '') { return { date: date }; } + + parsedTime = $.datepicker.parseTime(timeFormat, timeString, timeSettings); + + if (!parsedTime) { + throw 'Wrong time format'; + } + + return { + date: date, + timeObj: parsedTime + }; }; /* |