From b8bdf1889ab26c5958d07d1082416ea991cb892a Mon Sep 17 00:00:00 2001 From: Andrew Aquino Date: Wed, 27 Mar 2024 11:02:43 -0700 Subject: [PATCH 1/2] refactor: use anonymous function as event listener callback for listing meetings --- assets/js/right-col-content.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/js/right-col-content.js b/assets/js/right-col-content.js index 7571c60999..5599285eaa 100644 --- a/assets/js/right-col-content.js +++ b/assets/js/right-col-content.js @@ -10,7 +10,7 @@ import { getEventData, insertEventSchedule } from "./utility/api-events.js"; //Displays/Inserts event schedule to DOM document.addEventListener( "DOMContentLoaded", - insertEventSchedule(eventData, "events") + () => { insertEventSchedule(eventData, "events"); } ); //Displays/Inserts the user's time zone in the DOM document From cda844b97e33775ec1ad15f655743c8913c5f62c Mon Sep 17 00:00:00 2001 From: Andrew Aquino Date: Thu, 28 Mar 2024 14:37:07 -0700 Subject: [PATCH 2/2] fix: prevent race condition between DOMContentLoaded and getEventData based on #6543 --- assets/js/right-col-content.js | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/assets/js/right-col-content.js b/assets/js/right-col-content.js index 5599285eaa..372d790167 100644 --- a/assets/js/right-col-content.js +++ b/assets/js/right-col-content.js @@ -8,12 +8,18 @@ import { getEventData, insertEventSchedule } from "./utility/api-events.js"; const eventData = await getEventData(); //Displays/Inserts event schedule to DOM - document.addEventListener( - "DOMContentLoaded", - () => { insertEventSchedule(eventData, "events"); } - ); + if (document.readyState === "loading") { + document.addEventListener( + "DOMContentLoaded", + () => { insertEventSchedule(eventData, "events"); } + ); + } + else { + insertEventSchedule(eventData, "events"); + } + //Displays/Inserts the user's time zone in the DOM document .querySelector("#userTimeZone") .insertAdjacentHTML("afterbegin", timeZoneText()); -})(); +})(); \ No newline at end of file