X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit-ng%2Fstatic%2Fjs%2Fviews.js;h=549ff1d47b8c393cc340b2e4b4ebe67578caac46;hb=fc9eaf2e70bad8b188727db02c610155cabff931;hp=99db3efa6d77454c6550f618ac69f577c9a605ef;hpb=902af964115bd606c4a4ed0ad0ac865b9999d9d4;p=citadel.git

diff --git a/webcit-ng/static/js/views.js b/webcit-ng/static/js/views.js
index 99db3efa6..549ff1d47 100644
--- a/webcit-ng/static/js/views.js
+++ b/webcit-ng/static/js/views.js
@@ -41,7 +41,8 @@ function render_room_view(gt_msg, lt_msg)
 			forum_readmessages("ctdl-main", gt_msg, lt_msg);
 			break;
 		default:
-			document.getElementById("ctdl-main").innerHTML = "The view for " + current_room + " is " + current_view + " but there is no renderer." ;
+			document.getElementById("ctdl-main").innerHTML =
+				"The view for " + current_room + " is " + current_view + " but there is no renderer." ;
 			break;
 	}
 
@@ -52,10 +53,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 +74,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.
@@ -82,8 +83,8 @@ function forum_readmessages(target_div, gt_msg, lt_msg)
 					msgs = msgs.slice(0, messages_per_page);
 				}
 
-				// show us the last 20 messages and scroll to the bottom (this will become the not-logged-in behavior)
-				else if ((logged_in) | (!logged_in) | (lt_msg < 9999999999))
+				// Otherwise, show us the last 20 messages
+				else
 				{
 					if (msgs.length > messages_per_page)
 					{
@@ -98,7 +99,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 +108,10 @@ 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,18 +124,37 @@ 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>" ;
+						"<a href=\"javascript:forum_readmessages('" + new_new_div_name + "', " + newgt + ", 9999999999);\">"
+						+ "link to msgs greater than " + newgt + "</a></div>" ;
+				}
+
+				// Now figure out where to scroll to after rendering.
+				if (gt_msg > 0)
+				{
+					scroll_to = msgs[0];
+				}
+				else if (lt_msg < 9999999999)
+				{
+					scroll_to = msgs[msgs.length-1];
+				}
+				else if ( (logged_in) && (gt_msg == 0) && (lt_msg == 9999999999) )
+				{
+					scroll_to = msgs[msgs.length-1];
+				}
+				else
+				{
+					scroll_to = msgs[0];		// FIXME this is too naive
 				}
 
 				// Render the individual messages in the divs
-				render_messages(msgs, "ctdl_msg_", views.VIEW_BBS);
+				forum_render_messages(msgs, "ctdl_msg_", scroll_to)
 			}
 			else
 			{
-				document.getElementById(innerdivname).innerHTML = "ERROR " + this.status ;		// error message
+				// if xhr fails, this will make the link reappear so the user can try again
+				document.getElementById(target_div).innerHTML = original_text;
 			}
 		}
 	};
@@ -140,13 +163,65 @@ function forum_readmessages(target_div, gt_msg, lt_msg)
 }
 
 
-// Render a range of messages, in the view specified, with the div prefix specified
+// Render a range of messages, with the div prefix specified
 //
-function render_messages(msgs, prefix, view)
+function forum_render_messages(msgs, prefix, scroll_to)
 {
-	for (var i in msgs)
+	for (i=0; i<msgs.length; ++i)
 	{
-		document.getElementById(prefix + msgs[i]).innerHTML = "<b>Message " + msgs[i] + " got rendered!!!</b>";
+		forum_render_one(prefix+msgs[i], msgs[i], scroll_to)
 	}
+}
+
+
+// We have to put each XHR for forum_render_messages() into its own stack frame, otherwise it jumbles them together.  I don't know why.
+function forum_render_one(div, msgnum, scroll_to)
+{
+	var request = new XMLHttpRequest();
+	request.open("GET", "/ctdl/r/" + escapeHTMLURI(current_room) + "/" + msgs[i] + "/json", true);
+	request.onreadystatechange = function()
+	{
+		if (this.readyState === 4)
+		{
+			if ((this.status / 100) == 2)
+			{
+				msg = JSON.parse(this.responseText);
+
+				document.getElementById(div).innerHTML =
+				  "<div class=\"ctdl-msg-wrapper\">"				// begin message wrapper
+				+ "<div class=\"ctdl-avatar\">"					// begin avatar
 
+				+ "<img src=\"/ctdl/u/" + msg.from + "/userpic\" width=\"32\" onerror=\"this.parentNode.innerHTML='FIXME'\">"
+
+				//+ "<i class=\"fa fa-user-circle fa-2x\"></i> "			// FIXME temporary avatar
+				+ "</div>"							// end avatar
+				+ "<div class=\"ctdl-msg-content\">"				// begin content
+				+ "<div class=\"ctdl-msg-header\">"				// begin header
+				+ "<span class=\"ctdl-username\"><a href=\"#\">"		// FIXME link to user profile
+				+ msg.from
+				+ "</a></span> "
+				+ "<span class=\"ctdl-msgdate\">"
+				+ msg.time
+				+ "</span> "
+				+ "</div>"							// end header
+				+ "<div>"							// begin body
+				+ msg.text
+				+ "</div>"							// end body
+				+ "</div>"							// end content
+				+ "</div>"							// end wrapper
+				;
+			}
+			else
+			{
+				document.getElementById(div).innerHTML = "ERROR";
+			}
+			if (msgnum == scroll_to)
+			{
+				window.location.hash = div;
+			}
+		}
+	};
+	request.send();
+	request = null;
 }
+