From 3730457c3df1d3603602e8390f67bde108041be9 Mon Sep 17 00:00:00 2001 From: Art Cancro Date: Wed, 15 Dec 2021 00:03:15 -0500 Subject: [PATCH] New functions to activate and deactivate the Loading... modal --- webcit-ng/static/index.html | 9 +++++++++ webcit-ng/static/js/main.js | 15 +++++++++++++++ webcit-ng/static/js/view_forum.js | 6 +++--- 3 files changed, 27 insertions(+), 3 deletions(-) diff --git a/webcit-ng/static/index.html b/webcit-ng/static/index.html index 741805247..5e02bb2d9 100644 --- a/webcit-ng/static/index.html +++ b/webcit-ng/static/index.html @@ -16,6 +16,15 @@ + + +

diff --git a/webcit-ng/static/js/main.js b/webcit-ng/static/js/main.js index 05d7fc40b..e76c9f44f 100644 --- a/webcit-ng/static/js/main.js +++ b/webcit-ng/static/js/main.js @@ -193,3 +193,18 @@ function load_new_march_list() { } fetchm(); } + + +// Activate the "Loading..." modal +function activate_loading_modal() { + document.getElementById("ctdl_big_modal_content").innerHTML = + " " + + _("Loading messages from server, please wait"); + document.getElementById("ctdl_big_modal").style.display = "block"; +} + + +// Disappear the "Loading..." modal +function deactivate_loading_modal() { + document.getElementById("ctdl_big_modal").style.display = "none"; +} diff --git a/webcit-ng/static/js/view_forum.js b/webcit-ng/static/js/view_forum.js index 3d913605f..0aadaf820 100644 --- a/webcit-ng/static/js/view_forum.js +++ b/webcit-ng/static/js/view_forum.js @@ -15,9 +15,7 @@ function forum_readmessages(target_div_name, gt_msg, lt_msg) { target_div = document.getElementById(target_div_name); original_text = target_div.innerHTML; // in case we need to replace it after an error - target_div.innerHTML = - "

" - + _("Loading messages from server, please wait") + "

"; + target_div.innerHTML = "" if (lt_msg < 9999999999) { url = "/ctdl/r/" + escapeHTMLURI(current_room) + "/msgs.lt|" + lt_msg; @@ -123,7 +121,9 @@ function forum_render_messages(message_numbers, msgs_div_name, scroll_to) { // Here is the async function that waits for all the messages to be loaded, and then renders them. fetch_msg_list = async() => { document.body.style.cursor = "wait"; + activate_loading_modal(); await Promise.all(msg_promises); + deactivate_loading_modal(); document.body.style.cursor = "default"; // At this point all of the Promises are resolved and we can render. -- 2.39.2