Skip to content

Fix for minyear and maxyear in the calendar.js #26119

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

Merged
HLeithner merged 9 commits into from
Sep 17, 2019
Merged

Fix for minyear and maxyear in the calendar.js #26119

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
285c9ca
Fix for minyear and maxyear in the calendar.js
pinta83 Sep 1, 2019
6be1ada
Updated calendar.min.js
pinta83 Sep 1, 2019
5cd6c0d
Merge branch 'staging' into patch-1
pinta83 Sep 2, 2019
78f2c98
Update calendar.js
pinta83 Sep 2, 2019
266b60c
Update calendar.min.js
pinta83 Sep 2, 2019
88b5507
Update calendar.js
pinta83 Sep 3, 2019
922baab
Update calendar.min.js
pinta83 Sep 3, 2019
12a8eb8
Merge branch 'staging' into patch-1
pinta83 Sep 5, 2019
a252151
Merge branch 'staging' into patch-1
pinta83 Sep 7, 2019
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
4 changes: 2 additions & 2 deletions media/system/js/fields/calendar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -858,10 +858,10 @@

if (year < this.params.minYear) { // Check min,max year
year = this.params.minYear;
date.getOtherFullYear(this.params.dateType, year);
date.setOtherFullYear(this.params.dateType, year);
} else if (year > this.params.maxYear) {
Comment thread
pinta83 marked this conversation as resolved.
year = this.params.maxYear;
date.getOtherFullYear(this.params.dateType, year);
date.setOtherFullYear(this.params.dateType, year);;

@C-Lodder C-Lodder Sep 3, 2019

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You have a double semi-colon at the end of this

@pinta83 pinta83 Sep 3, 2019

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed

}

this.params.firstDayOfWeek = firstDayOfWeek;
Expand Down
Loading