Replaced all XHR in main.js with fetch/await

[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 0abc6ae7f8a577399f092b870c694f47b3bfb2b2..9fb998a3df9e50f4619466bd905492fac3c0ae97 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,43 +85,37 @@ function escapeJS(text) {
 
 // This is called at the very beginning of the main page load.
 //
-function ctdl_startup() {
+ctdl_startup = async() => {
+       response = await fetch("/ctdl/c/info");
+       serv_info = await(response.json());
 
-       const csa = async () => {
-               console.log("starting");
-               const 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");
-                       }
-       
-                       update_banner();
-       
-                       // for now, show a room list in the main div
-                       gotoroom("_BASEROOM_");
-                       display_room_list();
+       if (response.ok) {
+               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();
        }
-       csa();
 }
 
 
 // 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);
-       request.onreadystatechange = function() {
-               if ((this.readyState === 4) && ((this.status / 100) == 2)) {
-                       display_room_list_renderer(JSON.parse(this.responseText));
+       fetch_room_list = async() => {
+               response = await fetch("/ctdl/r/");
+               room_list = await(response.json());
+               if (response.ok) {
+                       display_room_list_renderer(room_list);
                }
-       };
-       request.send();
-       request = null;
+       }
+       fetch_room_list();
 }
 
 
@@ -182,25 +178,22 @@ function update_banner() {
 // goto room
 //
 function gotoroom(roomname) {
-       var request = new XMLHttpRequest();
-       request.open("GET", "/ctdl/r/" + escapeHTMLURI(roomname) + "/", true);
-       request.onreadystatechange = function() {
-               if ((this.readyState === 4) && ((this.status / 100) == 2)) {
-                       gotoroom_2(JSON.parse(this.responseText));
+
+       fetch_room = async() => {
+               response = await fetch("/ctdl/r/" + escapeHTMLURI(roomname) + "/");
+               data = await(response.json());
+               if (response.ok) {
+                       current_room = data.name;
+                       new_messages = data.new_messages;
+                       total_messages = data.total_messages;
+                       current_view = data.current_view;
+                       default_view = data.default_view;
+                       last_seen = data.last_seen;
+                       update_banner();
+                       render_room_view(0, 9999999999);
                }
-       };
-       request.send();
-       request = null;
-}
-function gotoroom_2(data) {
-       current_room = data.name;
-       new_messages = data.new_messages;
-       total_messages = data.total_messages;
-       current_view = data.current_view;
-       default_view = data.default_view;
-       last_seen = data.last_seen;
-       update_banner();
-       render_room_view(0, 9999999999);
+       }
+       fetch_room();
 }
 
 
@@ -224,11 +217,10 @@ function gotonext(which_oper) {
 // Called by gotonext() when the march list is empty.
 //
 function load_new_march_list() {
-       var request = new XMLHttpRequest();
-       request.open("GET", "/ctdl/r/", true);
-       request.onreadystatechange = function() {
-               if ((this.readyState === 4) && ((this.status / 100) == 2)) {
-                       march_list = (JSON.parse(this.responseText));
+       fetchm = async() => {
+               response = await fetch("/ctdl/r/");
+               march_list = await(response.json());
+               if (response.ok) {
                        march_list = march_list.filter(function(room) {
                                return room.hasnewmsgs;
                        });
@@ -244,7 +236,6 @@ function load_new_march_list() {
                        march_list.push({name:"_BASEROOM_",known:true,hasnewmsgs:true,floor:0});
                        gotonext();
                }
-       };
-       request.send();
-       request = null;
+       }
+       fetchm();
 }