Skip to content

Fix a minor issue with the datepicker. #2944

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

Open
drgrice1 wants to merge 1 commit into
base: WeBWorK-2.21
Choose a base branch
from
+16 −14
Open

Fix a minor issue with the datepicker. #2944

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
15 changes: 8 additions & 7 deletions htdocs/js/DatePicker/datepicker.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,13 +119,14 @@
],
onClick: (index, fp) => {
if (index === 0) {
const today = new Date();
// If there isn't a selected date, then use 12:00 am on the current date.
const selectedDate = fp.selectedDates[0] ?? new Date(new Date().toDateString());
selectedDate.setFullYear(today.getFullYear());
selectedDate.setMonth(today.getMonth());
selectedDate.setDate(today.getDate());
fp.setDate(selectedDate, true);
// The initial date represents 12:00 am on the current date.
const today = new Date(new Date().toDateString());
if (fp.selectedDates[0]) {
today.setHours(fp.selectedDates[0].getHours());
today.setMinutes(fp.selectedDates[0].getMinutes());
today.setSeconds(fp.selectedDates[0].getSeconds());
}
fp.setDate(today, true);
} else if (index === 1) {
fp.setDate(new Date(), true);
}
Expand Down
15 changes: 8 additions & 7 deletions htdocs/js/ProblemSetList/problemsetlist.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,13 +251,14 @@
],
onClick: (index, fp) => {
if (index === 0) {
const today = new Date();
// If there isn't a selected date, then use 12:00 am on the current date.
const selectedDate = fp.selectedDates[0] ?? new Date(new Date().toDateString());
selectedDate.setFullYear(today.getFullYear());
selectedDate.setMonth(today.getMonth());
selectedDate.setDate(today.getDate());
fp.setDate(selectedDate);
// The initial date represents 12:00 am on the current date.
const today = new Date(new Date().toDateString());
if (fp.selectedDates[0]) {
today.setHours(fp.selectedDates[0].getHours());
today.setMinutes(fp.selectedDates[0].getMinutes());
today.setSeconds(fp.selectedDates[0].getSeconds());
}
fp.setDate(today, true);
} else if (index === 1) {
fp.setDate(new Date());
}
Expand Down
Loading