Skip to content

Commit 353ff5e

Browse files
committed
Refactored parseDateTimeInternal() to make it a little simpler to read and test.
1 parent c264915 commit 353ff5e

File tree

1 file changed

+19
-13
lines changed

1 file changed

+19
-13
lines changed

jquery-ui-timepicker-addon.js

Lines changed: 19 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1877,25 +1877,31 @@
18771877
* timeObj = {hour: , minute: , second: , millisec: , microsec: } - parsed time. Optional
18781878
*/
18791879
var parseDateTimeInternal = function(dateFormat, timeFormat, dateTimeString, dateSettings, timeSettings) {
1880-
var date;
1881-
var splitRes = splitDateTime(dateFormat, dateTimeString, dateSettings, timeSettings);
1880+
var date,
1881+
splitRes,
1882+
timeString,
1883+
parsedTime;
1884+
1885+
splitRes = splitDateTime(dateFormat, dateTimeString, dateSettings, timeSettings);
18821886
date = $.datepicker._base_parseDate(dateFormat, splitRes[0], dateSettings);
1883-
if (splitRes[1] !== '') {
1884-
var timeString = splitRes[1],
1885-
parsedTime = $.datepicker.parseTime(timeFormat, timeString, timeSettings);
1887+
timeString = splitRes[1];
18861888

1887-
if (!parsedTime) {
1888-
throw 'Wrong time format';
1889-
}
1890-
return {
1891-
date: date,
1892-
timeObj: parsedTime
1893-
};
1894-
} else {
1889+
if (timeString === '') {
18951890
return {
18961891
date: date
18971892
};
18981893
}
1894+
1895+
parsedTime = $.datepicker.parseTime(timeFormat, timeString, timeSettings);
1896+
1897+
if (!parsedTime) {
1898+
throw 'Wrong time format';
1899+
}
1900+
1901+
return {
1902+
date: date,
1903+
timeObj: parsedTime
1904+
};
18991905
};
19001906

19011907
/*

0 commit comments

Comments
 (0)