fix bug with calendar offset (again)
This commit is contained in:
Vendored
+1
-1
@@ -689,7 +689,7 @@
|
|||||||
this.settingsModel.firstDayOfWeek
|
this.settingsModel.firstDayOfWeek
|
||||||
);
|
);
|
||||||
console.log(firstWeekdayOfMonth, firstDayOfWeekSetting);
|
console.log(firstWeekdayOfMonth, firstDayOfWeekSetting);
|
||||||
const offset = firstWeekdayOfMonth == 0 ? 7 - firstDayOfWeekSetting : firstWeekdayOfMonth - firstDayOfWeekSetting;
|
const offset = firstWeekdayOfMonth < firstDayOfWeekSetting ? 7 - firstDayOfWeekSetting : firstWeekdayOfMonth - firstDayOfWeekSetting;
|
||||||
date.setMonth(month);
|
date.setMonth(month);
|
||||||
date.setDate(-1);
|
date.setDate(-1);
|
||||||
const daysInMonth = date.getDate() + 1;
|
const daysInMonth = date.getDate() + 1;
|
||||||
|
|||||||
@@ -77,7 +77,7 @@ export default class CalendarModel {
|
|||||||
console.log(firstWeekdayOfMonth, firstDayOfWeekSetting);
|
console.log(firstWeekdayOfMonth, firstDayOfWeekSetting);
|
||||||
|
|
||||||
const offset: number =
|
const offset: number =
|
||||||
firstWeekdayOfMonth == 0
|
firstWeekdayOfMonth < firstDayOfWeekSetting
|
||||||
? 7 - firstDayOfWeekSetting
|
? 7 - firstDayOfWeekSetting
|
||||||
: firstWeekdayOfMonth - firstDayOfWeekSetting;
|
: firstWeekdayOfMonth - firstDayOfWeekSetting;
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user