From 445842c9919165ce768aa0f709505e8dec3eb5f2 Mon Sep 17 00:00:00 2001
From: Bandie <bandie@chaospott.de>
Date: Fri, 22 May 2020 03:25:10 +0200
Subject: [PATCH] Cancelled events for recurring events, too

---
 web/js/cal.js | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/web/js/cal.js b/web/js/cal.js
index bb43143..ec8e112 100644
--- a/web/js/cal.js
+++ b/web/js/cal.js
@@ -129,6 +129,14 @@ function parseIcalData(data) {
 
     events.map(function (e) {
         var event = new ICAL.Event(e)
+        if (event.component.getFirstPropertyValue("status") == "CANCELLED") {
+            console.log(event)
+            if (!(cancelledEvents[event.uid] instanceof Array)) {
+                cancelledEvents[event.uid] = []
+            }
+
+            cancelledEvents[event.uid].push(event.startDate.toJSDate().getTime())
+        }
 
         if (event.isRecurring()) {
             var expand = event.iterator()
@@ -145,16 +153,7 @@ function parseIcalData(data) {
                 }
             }
         } else if (eventInTimeRange(event, timeRangeStart, timeRangeStop)) {
-            if (event.component.getFirstPropertyValue("status") == "CANCELLED") {
-                console.log(event)
-                if (!(cancelledEvents[event.uid] instanceof Array)) {
-                    cancelledEvents[event.uid] = []
-                }
-
-                cancelledEvents[event.uid].push(event.startDate.toJSDate().getTime())
-            } else {
-                eventList.push(new Event(event.startDate, event))
-            }
+            eventList.push(new Event(event.startDate, event))
         }
     })
 }