Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add minSpan option #2173

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add minSpan option #2173

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion daterangepicker.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,11 @@
color: #999;
}

.daterangepicker td.in-range {
.daterangepicker td.off.in-range-min-span {
cursor: not-allowed;
}

.daterangepicker td.in-range, .daterangepicker td.off.in-range-min-span {
background-color: #ebf4f8;
border-color: transparent;
color: #000;
Expand Down
13 changes: 13 additions & 0 deletions daterangepicker.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
this.endDate = moment().endOf('day');
this.minDate = false;
this.maxDate = false;
this.minSpan = false;
this.maxSpan = false;
this.autoApply = false;
this.singleDatePicker = false;
Expand Down Expand Up @@ -205,6 +206,9 @@

if (typeof options.cancelClass === 'string') //backwards compat
this.cancelButtonClasses = options.cancelClass;

if (typeof options.minSpan === 'object')
this.minSpan = options.minSpan;

if (typeof options.maxSpan === 'object')
this.maxSpan = options.maxSpan;
Expand Down Expand Up @@ -330,6 +334,8 @@
start = this.minDate.clone();

var maxDate = this.maxDate;
if (this.minSpan && start.clone().add(this.minSpan).isAfter(end))
end = start.clone().add(this.minSpan);
if (this.maxSpan && maxDate && start.clone().add(this.maxSpan).isAfter(maxDate))
maxDate = start.clone().add(this.maxSpan);
if (maxDate && end.isAfter(maxDate))
Expand Down Expand Up @@ -499,6 +505,9 @@

if (this.maxDate && this.endDate.isAfter(this.maxDate))
this.endDate = this.maxDate.clone();

if (this.minSpan && this.startDate.clone().add(this.minSpan).isAfter(this.endDate))
this.endDate = this.startDate.clone().add(this.minSpan);

if (this.maxSpan && this.startDate.clone().add(this.maxSpan).isBefore(this.endDate))
this.endDate = this.startDate.clone().add(this.maxSpan);
Expand Down Expand Up @@ -802,6 +811,10 @@
//don't allow selection of dates after the maximum date
if (maxDate && calendar[row][col].isAfter(maxDate, 'day'))
classes.push('off', 'disabled');

//don't allow selection of dates between startDate and minSpan
if (this.minSpan && this.startDate && calendar[row][col].isAfter(this.startDate, 'day') && calendar[row][col].isBefore(this.startDate.clone().add(this.minSpan), 'day'))
classes.push('off', 'in-range-min-span');

//don't allow selection of date if a custom function decides it's invalid
if (this.isInvalidDate(calendar[row][col]))
Expand Down
19 changes: 14 additions & 5 deletions demo.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,12 @@ <h1 style="margin: 0 0 20px 0">Configuration Builder</h1>

<div class="form-group">
<label for="startDate">startDate</label>
<input type="text" class="form-control" id="startDate" value="07/01/2015">
<input type="text" class="form-control" id="startDate" value="11/11/2021">
</div>

<div class="form-group">
<label for="endDate">endDate</label>
<input type="text" class="form-control" id="endDate" value="07/15/2015">
<input type="text" class="form-control" id="endDate" value="11/14/2021">
</div>

<div class="form-group">
Expand Down Expand Up @@ -113,10 +113,16 @@ <h1 style="margin: 0 0 20px 0">Configuration Builder</h1>
<input type="checkbox" id="timePickerSeconds"> timePickerSeconds
</label>
</div>

<div class="checkbox">
<label>
<input type="checkbox" id="minSpan" checked="checked"> minSpan (with example value)
</label>
</div>

<div class="checkbox">
<label>
<input type="checkbox" id="dateLimit"> dateLimit (with example date range span)
<input type="checkbox" id="maxSpan" checked="checked"> maxSpan (with example value)
</label>
</div>

Expand Down Expand Up @@ -286,8 +292,11 @@ <h4>Configuration</h4>
if ($('#autoApply').is(':checked'))
options.autoApply = true;

if ($('#dateLimit').is(':checked'))
options.dateLimit = { days: 7 };
if ($('#minSpan').is(':checked'))
options.minSpan = { days: 3 };

if ($('#maxSpan').is(':checked'))
options.maxSpan = { days: 7 };

if ($('#ranges').is(':checked')) {
options.ranges = {
Expand Down