Tools/Notes
1
0
Fork 0
mirror of https://github.com/TriliumNext/Notes.git synced 2025-10-18 12:41:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: 🐛 fix error caused by first day of week change

Browse Source
This commit is contained in:
Jin 2025-03-31 19:36:57 +02:00
parent d79604d06a
commit 45633ad418
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/public/app/widgets/buttons/calendar.ts
View File

@ -314,8 +314,11 @@ export default class CalendarWidget extends RightDropdownButtonWidget {
const nextMonthFirstDay = new Date(this.date.getFullYear(), this.date.getMonth() + 1, 1); const nextMonthFirstDay = new Date(this.date.getFullYear(), this.date.getMonth() + 1, 1);
const dates = []; const dates = [];
const lastDayOfUserWeek = (this.firstDayOfWeek + 6) % 7;
const daysToAdd = (lastDayOfUserWeek - lastDayOfWeek + 7) % 7;
// Get dates from next month // Get dates from next month
for (let i = 0; i < 7 - lastDayOfWeek; i++) { for (let i = 0; i < daysToAdd; i++) {
dates.push(new Date(nextMonthFirstDay.getFullYear(), nextMonthFirstDay.getMonth(), i + 1)); dates.push(new Date(nextMonthFirstDay.getFullYear(), nextMonthFirstDay.getMonth(), i + 1));
} }
@ -371,7 +374,8 @@ export default class CalendarWidget extends RightDropdownButtonWidget {
// Add dates from next month // Add dates from next month
const lastDay = new Date(this.date.getFullYear(), this.date.getMonth(), 0); const lastDay = new Date(this.date.getFullYear(), this.date.getMonth(), 0);
const lastDayOfWeek = lastDay.getDay(); const lastDayOfWeek = lastDay.getDay();
if (lastDayOfWeek !== 7) { const lastDayOfUserWeek = (this.firstDayOfWeek + 6) % 7;
if (lastDayOfWeek !== lastDayOfUserWeek) {
const dates = this.getNextMonthDays(lastDayOfWeek); const dates = this.getNextMonthDays(lastDayOfWeek);
const nextMonth = new Date(this.date.getFullYear(), this.date.getMonth() + 1, 1); const nextMonth = new Date(this.date.getFullYear(), this.date.getMonth() + 1, 1);