Tools/Notes
1
0
Fork 0
mirror of https://github.com/TriliumNext/Notes.git synced 2025-08-11 02:42:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

chore: 🤖 use dayjs part 2

Browse Source
This commit is contained in:
Jin 2025-03-31 23:27:14 +02:00
parent c1feedb4db
commit 1a49c4a1e2
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -318,23 +318,23 @@ export default class CalendarWidget extends RightDropdownButtonWidget {
} }
private getPrevMonthDays(firstDayOfWeek: number): { weekNumber: number, dates: Date[] } { private getPrevMonthDays(firstDayOfWeek: number): { weekNumber: number, dates: Date[] } {
const prevMonthLastDay = new Date(this.date.getFullYear(), this.date.getMonth(), 0); const prevMonthLastDay = dayjs(this.date).subtract(1, 'month').endOf('month');
const daysToAdd = (firstDayOfWeek - this.firstDayOfWeek + 7) % 7; const daysToAdd = (firstDayOfWeek - this.firstDayOfWeek + 7) % 7;
const dates = []; const dates = [];
const firstDay = new Date(this.date.getFullYear(), this.date.getMonth(), 1); const firstDay = dayjs(this.date).startOf('month');
const weekNumber = this.getWeekNumber(firstDay); const weekNumber = this.getWeekNumber(firstDay.toDate());
// Get dates from previous month // Get dates from previous month
for (let i = daysToAdd - 1; i >= 0; i--) { for (let i = daysToAdd - 1; i >= 0; i--) {
dates.push(new Date(prevMonthLastDay.getFullYear(), prevMonthLastDay.getMonth(), prevMonthLastDay.getDate() - i)); dates.push(prevMonthLastDay.subtract(i, 'day').toDate());
} }
return { weekNumber, dates }; return { weekNumber, dates };
} }
private getNextMonthDays(lastDayOfWeek: number): Date[] { private getNextMonthDays(lastDayOfWeek: number): Date[] {
const nextMonthFirstDay = new Date(this.date.getFullYear(), this.date.getMonth() + 1, 1); const nextMonthFirstDay = dayjs(this.date).add(1, 'month').startOf('month');
const dates = []; const dates = [];
const lastDayOfUserWeek = (this.firstDayOfWeek + 6) % 7; const lastDayOfUserWeek = (this.firstDayOfWeek + 6) % 7;
@ -342,7 +342,7 @@ export default class CalendarWidget extends RightDropdownButtonWidget {
// Get dates from next month // Get dates from next month
for (let i = 0; i < daysToAdd; i++) { for (let i = 0; i < daysToAdd; i++) {
dates.push(new Date(nextMonthFirstDay.getFullYear(), nextMonthFirstDay.getMonth(), i + 1)); dates.push(nextMonthFirstDay.add(i, 'day').toDate());
} }
return dates; return dates;