From: Art Cancro <ajc@citadel.org>
Date: Sat, 26 Dec 2020 20:02:12 +0000 (-0500)
Subject: Rewrote ctdl_startup() using fetch/await
X-Git-Tag: v939~186
X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=e560dff819d748744fb7e6ce4e20580ed1e77671

Rewrote ctdl_startup() using fetch/await
---

diff --git a/webcit-ng/static/js/main.js b/webcit-ng/static/js/main.js
index 943d7519f..8aa871121 100644
--- a/webcit-ng/static/js/main.js
+++ b/webcit-ng/static/js/main.js
@@ -84,32 +84,26 @@ function escapeJS(text) {
 // This is called at the very beginning of the main page load.
 //
 function ctdl_startup() {
-	var request = new XMLHttpRequest();
-	request.open("GET", "/ctdl/c/info", true);
-	request.onreadystatechange = function() {
-		if ((this.readyState === 4) && ((this.status / 100) == 2)) {
-			ctdl_startup_2(JSON.parse(this.responseText));
-		}
-	};
-	request.send();
-	request = null;
-}
 
+	const csa = async () => {
+		console.log("starting");
+		const response = await fetch("/ctdl/c/info");
+		const the_text = await(response.text());
 
-// Continuation of ctdl_startup() after serv_info is retrieved
-//
-function ctdl_startup_2(data) {
-	serv_info = data;
-
-	if (data.serv_rev_level < 905) {
-		alert("Citadel server is too old, some functions may not work");
+		if (response.ok) {
+			serv_info = JSON.parse(the_text);
+			if (serv_info.serv_rev_level < 905) {
+				alert("Citadel server is too old, some functions may not work");
+			}
+	
+			update_banner();
+	
+			// for now, show a room list in the main div
+			gotoroom("_BASEROOM_");
+			display_room_list();
+		}
 	}
-
-	update_banner();
-
-	// for now, show a room list in the main div
-	gotoroom("_BASEROOM_");
-	display_room_list();
+	csa();
 }