X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit-ng%2Fstatic%2Fjs%2Fviews.js;h=12642210f40a46b3b65b7ecd6e3bc32c4347e038;hb=d41e1a56e4f10994ea88d2dd3680f273c4e8eb8d;hp=743a93ef2589fd01d1ff211f9e73c1a094a9bc89;hpb=5573e4f9af0446451635a33adf9ca2846c8d6af8;p=citadel.git

diff --git a/webcit-ng/static/js/views.js b/webcit-ng/static/js/views.js
index 743a93ef2..12642210f 100644
--- a/webcit-ng/static/js/views.js
+++ b/webcit-ng/static/js/views.js
@@ -52,10 +52,10 @@ function render_room_view(gt_msg, lt_msg)
 //
 function forum_readmessages(target_div, gt_msg, lt_msg)
 {
-	var innerdivname = randomString(5);
-	document.getElementById(target_div).innerHTML = "<div id=\"" + innerdivname +
-		"\"><i class=\"fas fa-spinner fa-spin\"></i>&nbsp;&nbsp;"
-		+ _("Loading messages from server, please wait") + "</div>" ;
+	original_text = document.getElementById(target_div).innerHTML;		// in case we need to replace it after an error
+	document.getElementById(target_div).innerHTML = 
+		"<i class=\"fas fa-spinner fa-spin\"></i>&nbsp;&nbsp;"
+		+ _("Loading messages from server, please wait") ;
 
 	var request = new XMLHttpRequest();
 	if (lt_msg < 9999999999)
@@ -73,7 +73,7 @@ function forum_readmessages(target_div, gt_msg, lt_msg)
 			if ((this.status / 100) == 2)
 			{
 				msgs = JSON.parse(this.responseText);
-				document.getElementById(innerdivname).innerHTML = "" ;
+				document.getElementById(target_div).innerHTML = "" ;
 
 				// If we were given an explicit starting point, by all means start there.
 				// Note that we don't have to remove them from the array because we did a 'msgs gt|xxx' command to Citadel.
@@ -98,7 +98,7 @@ function forum_readmessages(target_div, gt_msg, lt_msg)
 					{
 						newlt = msgs[0];
 					}
-					document.getElementById(innerdivname).innerHTML +=
+					document.getElementById(target_div).innerHTML +=
 						"<div id=\"" + new_old_div_name + "\">" +
 						"<a href=\"javascript:forum_readmessages('" + new_old_div_name + "', 0, " + newlt + ");\">" +
 						"link to msgs less than " + newlt + "</a></div>" ;
@@ -107,7 +107,7 @@ function forum_readmessages(target_div, gt_msg, lt_msg)
 				// Render the divs (we will fill them in later)
 				for (var i in msgs)
 				{
-					document.getElementById(innerdivname).innerHTML += "<div id=\"ctdl_msg_" + msgs[i] + "\">#" + msgs[i] + "</div>" ;
+					document.getElementById(target_div).innerHTML += "<div id=\"ctdl_msg_" + msgs[i] + "\">#" + msgs[i] + "</div>" ;
 				}
 				if (lt_msg == 9999999999)
 				{
@@ -120,7 +120,7 @@ function forum_readmessages(target_div, gt_msg, lt_msg)
 					{
 						newgt = msgs[msgs.length-1];
 					}
-					document.getElementById(innerdivname).innerHTML +=
+					document.getElementById(target_div).innerHTML +=
 						"<div id=\"" + new_new_div_name + "\">" +
 						"<a href=\"javascript:forum_readmessages('" + new_new_div_name + "', " + newgt + ", 9999999999);\">" +
 						"link to msgs greater than " + newgt + "</a></div>" ;
@@ -131,8 +131,7 @@ function forum_readmessages(target_div, gt_msg, lt_msg)
 			}
 			else
 			{
-				document.getElementById(innerdivname).innerHTML = "error put it back";
-				alert("ERROR " + this.status + " retrieving messages from server");
+				document.getElementById(target_div).innerHTML = original_text;		// this will make the link reappear so the user can try again
 			}
 		}
 	};