Skip to content

[Calendar] new option autoAdjustDateEdges avoid invalid mindate/maxdate combinations #1366

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

Draft
lubber-de wants to merge 7 commits into
base: develop
Choose a base branch
from
Draft

[Calendar] new option autoAdjustDateEdges avoid invalid mindate/maxdate combinations #1366

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
41ae434
fix(calendar): optional autoadjust min/max date in case min > max or …
lubber-de Mar 14, 2020
cd40b52
Merge branch 'develop' into fix/1364/calendarMinMaxAdjust
lubber-de Apr 28, 2022
e461dec
Merge branch 'develop' into fix/1364/calendarMinMaxAdjust
lubber-de Dec 4, 2022
105d3bd
fix(api): linting fixes
lubber-de Dec 4, 2022
d9a16d1
Merge branch 'develop' into fix/1364/calendarMinMaxAdjust
lubber-de Dec 25, 2022
45d1ecb
fix(calendar): fix linting issues
lubber-de Dec 25, 2022
04cf6f1
Merge branch 'develop' into fix/1364/calendarMinMaxAdjust
lubber-de Mar 19, 2023
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
25 changes: 17 additions & 8 deletions src/definitions/modules/calendar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -959,20 +959,28 @@
minDate: function (date) {
date = module.helper.sanitiseDate(date);
if (settings.maxDate !== null && settings.maxDate <= date) {
module.verbose('Unable to set minDate variable bigger that maxDate variable', date, settings.maxDate);
} else {
module.setting('minDate', date);
module.set.dataKeyValue(metadata.minDate, date);
if (!settings.autoAdjustDateEdges) {
module.error('Unable to set minDate variable bigger than maxDate variable', date, settings.maxDate);

return;
}
module.set.maxDate(date);
}
module.setting('minDate', date);
module.set.dataKeyValue(metadata.minDate, date);
},
maxDate: function (date) {
date = module.helper.sanitiseDate(date);
if (settings.minDate !== null && settings.minDate >= date) {
module.verbose('Unable to set maxDate variable lower that minDate variable', date, settings.minDate);
} else {
module.setting('maxDate', date);
module.set.dataKeyValue(metadata.maxDate, date);
if (!settings.autoAdjustDateEdges) {
module.error('Unable to set maxDate variable lower than minDate variable', date, settings.minDate);

return;
}
module.set.minDate(date);
}
module.setting('maxDate', date);
module.set.dataKeyValue(metadata.maxDate, date);
},
monthOffset: function (monthOffset, refreshCalendar) {
var multiMonth = Math.max(settings.multiMonth, 1);
Expand Down Expand Up @@ -1602,6 +1610,7 @@
startMode: false, // display mode to start in, can be 'year', 'month', 'day', 'hour', 'minute' (false = 'day')
minDate: null, // minimum date/time that can be selected, dates/times before are disabled
maxDate: null, // maximum date/time that can be selected, dates/times after are disabled
autoAdjustDateEdges: false, // automatically sets min or maxdate to the same as the opposite if maxdate < mindate or mindate > maxdate
disableYear: false, // disable year selection mode
disableMonth: false, // disable month selection mode
disableMinute: false, // disable minute selection mode
Expand Down