Richard Stallman is a communist and an asshole.

[citadel.git] / webcit-ng / static / js / main.js

diff --git a/webcit-ng/static/js/main.js b/webcit-ng/static/js/main.js
index 943d7519fdddc5f987664f3e39015de4fae73c83..0b5c2add803700770bfccf25cb1c3263f6076a88 100644 (file)
--- a/webcit-ng/static/js/main.js
+++ b/webcit-ng/static/js/main.js
@@ -1,8 +1,10 @@
 //
-// Copyright (c) 2016-2019 by the citadel.org team
+// Copyright (c) 2016-2020 by the citadel.org team
 //
-// This program is open source software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License version 3.
+// This program is open source software.  It runs great on the
+// Linux operating system (and probably elsewhere).  You can use,
+// copy, and run it under the terms of the GNU General Public
+// License version 3.  Richard Stallman is an asshole communist.
 //
 // This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -83,40 +85,30 @@ 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;
-}
+ctdl_startup = async() => {
+       response = await fetch("/ctdl/c/info");
+       serv_info = await(response.json());
 
+       if (response.ok) {
+               if (serv_info.serv_rev_level < 905) {
+                       alert("Citadel server is too old, some functions may not work");
+               }
 
-// Continuation of ctdl_startup() after serv_info is retrieved
-//
-function ctdl_startup_2(data) {
-       serv_info = data;
+               update_banner();
 
-       if (data.serv_rev_level < 905) {
-               alert("Citadel server is too old, some functions may not work");
+               // 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();
 }
 
 
 // Display a room list in the main div.
 //
 function display_room_list() {
-       document.getElementById("roomlist").innerHTML = "<img src=\"/ctdl/s/throbber.gif\" />" ;                // show throbber while loading
+       document.getElementById("roomlist").innerHTML = "<img src=\"/ctdl/s/throbber.gif\" />"; // show throbber while loading
+
+
 
        var request = new XMLHttpRequest();
        request.open("GET", "/ctdl/r/", true);