summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--jquery-ui-timepicker-addon.js4
-rw-r--r--test/jquery-ui-timepicker-addon_spec.js8
2 files changed, 6 insertions, 6 deletions
diff --git a/jquery-ui-timepicker-addon.js b/jquery-ui-timepicker-addon.js
index 26ddf73..d32a84f 100644
--- a/jquery-ui-timepicker-addon.js
+++ b/jquery-ui-timepicker-addon.js
@@ -1832,7 +1832,7 @@
* Throws exception when date can't be parsed
* Returns {dateString: dateString, timeString: timeString}
*/
- var splitDateTime = function(dateFormat, dateTimeString, dateSettings, timeSettings) {
+ var splitDateTime = function(dateTimeString, timeSettings) {
// The idea is to get the number separator occurrences in datetime and the time format requested (since time has
// fewer unknowns, mostly numbers and am/pm). We will use the time pattern to split.
var separator = computeEffectiveSetting(timeSettings, 'separator'),
@@ -1866,7 +1866,7 @@
parts,
parsedTime;
- parts = splitDateTime(dateFormat, dateTimeString, dateSettings, timeSettings);
+ parts = splitDateTime(dateTimeString, timeSettings);
date = $.datepicker._base_parseDate(dateFormat, parts.dateString, dateSettings);
if (parts.timeString === '') {
diff --git a/test/jquery-ui-timepicker-addon_spec.js b/test/jquery-ui-timepicker-addon_spec.js
index 125472d..6dfda55 100644
--- a/test/jquery-ui-timepicker-addon_spec.js
+++ b/test/jquery-ui-timepicker-addon_spec.js
@@ -230,7 +230,7 @@ describe('datetimepicker', function() {
var inputDateTimeString = expectedDateString + $.timepicker._defaults.separator + expectedTimeString,
result;
- result = $.timepicker._util._splitDateTime('', inputDateTimeString, {}, {});
+ result = $.timepicker._util._splitDateTime(inputDateTimeString, {});
expect(result).toEqual({dateString: expectedDateString, timeString: expectedTimeString});
});
@@ -240,7 +240,7 @@ describe('datetimepicker', function() {
inputDateTimeString = expectedDateString + separator + expectedTimeString,
result;
- result = $.timepicker._util._splitDateTime('', inputDateTimeString, {}, {separator: separator});
+ result = $.timepicker._util._splitDateTime(inputDateTimeString, {separator: separator});
expect(result).toEqual({dateString: expectedDateString, timeString: expectedTimeString});
});
@@ -253,13 +253,13 @@ describe('datetimepicker', function() {
timeSettings = {separator: separator, timeFormat: timeFormat},
result;
- result = $.timepicker._util._splitDateTime('', inputDateTimeString, {}, timeSettings);
+ result = $.timepicker._util._splitDateTime(inputDateTimeString, timeSettings);
expect(result).toEqual({dateString: expectedDateString, timeString: alternateTimeString});
});
it('splits only a date into itself', function() {
- var result = $.timepicker._util._splitDateTime('', expectedDateString, {}, {});
+ var result = $.timepicker._util._splitDateTime(expectedDateString, {});
expect(result).toEqual({dateString: expectedDateString, timeString: ''});
});