Event search (Ctrl+F), locale/RTL handling, weekday selector workday/weekend, refactored event handling, Firefox compatibility (#3)
Major refactoring for cleanup, with various bugfixes. Weekday selector in Settings now shows workdays/weekend bars based on current locale (also used to choose default values). Weekday selector in event dialog uses the days set in settings, as expected.
This commit is contained in:
@@ -4,7 +4,6 @@ import {
|
||||
fromLocalString,
|
||||
getLocaleWeekendDays,
|
||||
getMondayOfISOWeek,
|
||||
getOccurrenceDate,
|
||||
DEFAULT_TZ,
|
||||
} from '@/utils/date'
|
||||
import { differenceInCalendarDays, addDays } from 'date-fns'
|
||||
@@ -201,11 +200,6 @@ export const useCalendarStore = defineStore('calendar', {
|
||||
this.deleteEvent(baseId)
|
||||
return
|
||||
}
|
||||
const nextStartStr = getOccurrenceDate(base, 1, DEFAULT_TZ)
|
||||
if (!nextStartStr) {
|
||||
this.deleteEvent(baseId)
|
||||
return
|
||||
}
|
||||
base.startDate = nextStartStr
|
||||
// keep same days length
|
||||
if (numericCount !== Infinity) base.recur.count = String(Math.max(1, numericCount - 1))
|
||||
@@ -228,9 +222,11 @@ export const useCalendarStore = defineStore('calendar', {
|
||||
}
|
||||
const snapshot = { ...base }
|
||||
snapshot.recur = snapshot.recur ? { ...snapshot.recur } : null
|
||||
if (base.recur.count === occurrenceIndex + 1) {
|
||||
base.recur.count = occurrenceIndex
|
||||
return
|
||||
}
|
||||
base.recur.count = occurrenceIndex
|
||||
const nextStartStr = getOccurrenceDate(snapshot, occurrenceIndex + 1, DEFAULT_TZ)
|
||||
if (!nextStartStr) return
|
||||
const originalNumeric =
|
||||
snapshot.recur.count === 'unlimited' ? Infinity : parseInt(snapshot.recur.count, 10)
|
||||
let remainingCount = 'unlimited'
|
||||
|
||||
Reference in New Issue
Block a user