Skip to content

Commit ca4b62f

Browse files
committed
Fix #148: Correct date range preset dropdown selection for 'Today'
1 parent cb445c6 commit ca4b62f

File tree

2 files changed

+11
-1
lines changed

2 files changed

+11
-1
lines changed

CHANGE.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,9 @@ Change Log: `yii2-date-range`
33

44
## Version 1.7.2
55

6-
**Date:** 29-Jan-2020
6+
**Date:** 09-Feb-2020
77

8+
- (enh #148): Correct date range preset dropdown selection for "Today".
89
- (enh #147): Allow date range picker value to be cleared for preset dropdown.
910
- (enh #146): Enhance preset dropdown user interface.
1011
- (enh #143): Update initSettings to support indexes .

src/DateRangePicker.php

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -315,6 +315,15 @@ public function registerAssets()
315315
JS;
316316
if ($this->presetDropdown) {
317317
$js .= <<< JS
318+
{$id}.on('apply.daterangepicker', function() {
319+
var drp = {$id}.data('{$this->pluginName}'), newValue = drp.startDate.format(drp.locale.format);
320+
if (!drp.singleDatePicker) {
321+
newValue += drp.locale.separator + drp.endDate.format(drp.locale.format);
322+
}
323+
if (newValue !== {$input}.val()) {
324+
{$input}.val(newValue).trigger('change');
325+
}
326+
});
318327
{$id}.find('.range-value').attr('placeholder', {$input}.attr('placeholder'));
319328
{$id}.find('.kv-clear').on('click', function(e) {
320329
e.stopPropagation();

0 commit comments

Comments
 (0)