From 5c326c553c72b98dc223b7df6fd7ca052b0cc153 Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Sat, 31 Aug 2024 17:05:02 +0300 Subject: [PATCH] client: Add support for first day of week (closes #247) --- src/public/app/widgets/buttons/calendar.js | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/public/app/widgets/buttons/calendar.js b/src/public/app/widgets/buttons/calendar.js index 1f70c85fc..ec1931f44 100644 --- a/src/public/app/widgets/buttons/calendar.js +++ b/src/public/app/widgets/buttons/calendar.js @@ -167,11 +167,14 @@ export default class CalendarWidget extends RightDropdownButtonWidget { // if it's the first day of the month if (num === 1) { - if (day === 0) { - $newDay.css("marginLeft", (6 * 14.28) + '%'); - } else { - $newDay.css("marginLeft", `${(day - 1) * 14.28}%`); - } + // 0 1 2 3 4 5 6 + // Su Mo Tu We Th Fr Sa + // 1 2 3 4 5 6 0 + // Mo Tu We Th Fr Sa Su + let dayOffset = day - this.firstDayOfWeek; + if (dayOffset < 0) + dayOffset = 7 + dayOffset; + $newDay.css("marginLeft", (dayOffset * 14.28) + '%'); } const dateNoteId = dateNotesForMonth[utils.formatDateISO(this.date)];