projects
/
citadel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
66eec26
)
Rewrote ctdl_startup() using fetch/await
author
Art Cancro
<ajc@citadel.org>
Sat, 26 Dec 2020 20:02:12 +0000
(15:02 -0500)
committer
Art Cancro
<ajc@citadel.org>
Sat, 26 Dec 2020 20:02:12 +0000
(15:02 -0500)
webcit-ng/static/js/main.js
patch
|
blob
|
history
diff --git
a/webcit-ng/static/js/main.js
b/webcit-ng/static/js/main.js
index 943d7519fdddc5f987664f3e39015de4fae73c83..8aa87112162cb612f28c5e3df060241ea969df70 100644
(file)
--- 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() {
// 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();
}
}