Skip to content

Commit 5d6abd8

Browse files
committed
Update jquery-datepair
1 parent 21a8041 commit 5d6abd8

File tree

1 file changed

+13
-9
lines changed

1 file changed

+13
-9
lines changed

vendor/assets/javascripts/jquery.datepair.js

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ requires jQuery 1.7+
210210
settings.updateDate($endDateInput, newEnd);
211211
} else if ($endDateInput.val()) {
212212
var endDate = settings.parseDate($endDateInput);
213-
var newStart = new Date(endDate.getTime() + settings.defaultDateDelta * _ONE_DAY);
213+
var newStart = new Date(endDate.getTime() - settings.defaultDateDelta * _ONE_DAY);
214214
settings.updateDate($startDateInput, newStart);
215215
}
216216

@@ -268,7 +268,7 @@ requires jQuery 1.7+
268268
settings.updateTime($endTimeInput, newEnd);
269269
} else if ($endTimeInput.val()) {
270270
var endTime = settings.parseTime($endTimeInput);
271-
var newStart = new Date(endDate.getTime() + settings.defaultTimeDelta);
271+
var newStart = new Date(endTime.getTime() - settings.defaultTimeDelta);
272272
settings.updateTime($startTimeInput, newStart);
273273
}
274274

@@ -291,12 +291,12 @@ requires jQuery 1.7+
291291

292292
if ((endTime.getTime() - startTime.getTime()) * $self.data('datepair-timedelta') < 0) {
293293
var $endDateInput = _getEndDateInput($self);
294-
var endDate = settings.parseDate($endDateInput);
295-
var offset = (endTime < startTime) ? _ONE_DAY : -1 * _ONE_DAY;
296-
297-
settings.updateDate($endDateInput, new Date(endDate.getTime() + offset));
298-
var newDelta = $self.data('datepair-timedelta') + offset;
299-
$self.data('datepair-timedelta', newDelta);
294+
if ($endDateInput.val()) {
295+
var offset = (endTime < startTime) ? _ONE_DAY : -1 * _ONE_DAY;
296+
var endDate = settings.parseDate($endDateInput);
297+
settings.updateDate($endDateInput, new Date(endDate.getTime() + offset));
298+
_dateChanged($self, $endDateInput);
299+
}
300300
}
301301

302302
$self.data('datepair-timedelta', endTime.getTime() - startTime.getTime());
@@ -319,7 +319,11 @@ requires jQuery 1.7+
319319
return;
320320
}
321321

322-
$self.trigger('rangeSelected');
322+
if ($self.data('datepair-datedelta') + $self.data('datepair-timedelta') >= 0) {
323+
$self.trigger('rangeSelected');
324+
} else {
325+
$self.trigger('rangeError');
326+
}
323327
}
324328

325329

0 commit comments

Comments
 (0)