diff --git a/static/js/upcoming.js b/static/js/upcoming.js index 6b7a711..cc8ad0b 100644 --- a/static/js/upcoming.js +++ b/static/js/upcoming.js @@ -7,7 +7,7 @@ import ICAL from "https://unpkg.com/ical.js/dist/ical.min.js"; * @param {Date} now Events must start after this date * @param {number} maxEvents Maximum number of events to return * @param {number} maxDays Maximum number of days into the future - * @returns {{start: Date, name: string, url: string}[]} + * @returns {{start: Date, name: string, url: string}[]} url is empty when the event has no URL */ function getUpcomingEvents(icsText, now, maxEvents, maxDays) { const jcal = ICAL.parse(icsText); @@ -25,6 +25,9 @@ function getUpcomingEvents(icsText, now, maxEvents, maxDays) { continue; } + // ICAL.Event does not expose the URL property, so read it from the component. + const url = component.getFirstPropertyValue("url") ?? ""; + if (event.isRecurring()) { const iterator = event.iterator(); @@ -47,7 +50,7 @@ function getUpcomingEvents(icsText, now, maxEvents, maxDays) { events.push({ start, name: event.summary ?? "", - url: event.url ?? "", + url, }); } } @@ -58,7 +61,7 @@ function getUpcomingEvents(icsText, now, maxEvents, maxDays) { events.push({ start, name: event.summary ?? "", - url: event.url ?? "", + url, }); } } @@ -100,11 +103,16 @@ document.addEventListener("DOMContentLoaded", () => { const colName = document.createElement("td"); - const a = document.createElement("a"); - a.href = event.url; - a.text = event.name; + if (event.url) { + const a = document.createElement("a"); + a.href = event.url; + a.text = event.name; + + colName.appendChild(a); + } else { + colName.innerText = event.name; + } - colName.appendChild(a); row.appendChild(colName); table.appendChild(row);