sched/calendar interface: fix null timezone

nxdefiant · Dec 10, 2023 · c815168 · c815168
1 parent e513b90
commit c815168
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/apps/calendar/interface.html b/apps/calendar/interface.html
@@ -32,12 +32,14 @@
       const jCalData = ICAL.parse(icalText);
       const comp = new ICAL.Component(jCalData);
       const vtz = comp.getFirstSubcomponent('vtimezone');
-      const tz = new ICAL.Timezone(vtz);
+      const tz = vtz != null ? new ICAL.Timezone(vtz) : null;
 
       // Fetch the VEVENT part
       comp.getAllSubcomponents('vevent').forEach(vevent => {
         const event = new ICAL.Event(vevent);
-        event.startDate.zone = tz;
+        if (tz != null) {
+          event.startDate.zone = tz;
+        }
         holidays = holidays.filter(holiday => !sameDay(new Date(holiday.date), event.startDate.toJSDate())); // remove if already exists
 
         const holiday = eventToHoliday(event);

diff --git a/apps/sched/interface.html b/apps/sched/interface.html
@@ -20,7 +20,7 @@
       const jCalData = ICAL.parse(icalText);
       const comp = new ICAL.Component(jCalData);
       const vtz = comp.getFirstSubcomponent('vtimezone');
-      const tz = new ICAL.Timezone(vtz);
+      const tz = vtz != null ? new ICAL.Timezone(vtz) : null;
 
       // Fetch the VEVENT part
       comp.getAllSubcomponents('vevent').forEach(vevent => {
@@ -73,7 +73,9 @@
 }
 
 function eventToAlarm(event, tz, offsetMs) {
-  event.startDate.zone = tz;
+  if (tz != null) {
+    event.startDate.zone = tz;
+  }
   const dateOrig = event.startDate.toJSDate();
   const date = offsetMs ? new Date(dateOrig - offsetMs) : dateOrig;