X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit-ng%2Fstatic%2Fjs%2Fviews.js;h=5804155f48d6c97e87d7c7f51c6ce9ea6d675f2e;hb=ec0632c60fbcc1509eada758e6778afb4a52ea11;hp=7e10e3668b5d3b79a2499d9e79a826c20adacfe5;hpb=b1294d16d0b3ebc7ce5b9b47cc5e1cdf64e1896c;p=citadel.git

diff --git a/webcit-ng/static/js/views.js b/webcit-ng/static/js/views.js
index 7e10e3668..5804155f4 100644
--- a/webcit-ng/static/js/views.js
+++ b/webcit-ng/static/js/views.js
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2016-2018 by the citadel.org team
+// Copyright (c) 2016-2019 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.
@@ -34,14 +34,14 @@ var views = {
 //
 function render_room_view(gt_msg, lt_msg)
 {
-	switch(current_view)
-	{
+	switch(current_view) {
 		case views.VIEW_MAILBOX:						// FIXME view mail rooms as forums for now
 		case views.VIEW_BBS:
 			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,86 +52,91 @@ function render_room_view(gt_msg, lt_msg)
 //
 function forum_readmessages(target_div, gt_msg, lt_msg)
 {
+	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") ;
+		"<div align=\"center\"><i class=\"fas fa-spinner fa-spin\"></i>&nbsp;&nbsp;"
+		+ _("Loading messages from server, please wait") + "</div>";
 
 	var request = new XMLHttpRequest();
-	if (lt_msg < 9999999999)
-	{
+	if (lt_msg < 9999999999) {
 		request.open("GET", "/ctdl/r/" + escapeHTMLURI(current_room) + "/msgs.lt|" + lt_msg, true);
 	}
-	else
-	{
+	else {
 		request.open("GET", "/ctdl/r/" + escapeHTMLURI(current_room) + "/msgs.gt|" + gt_msg, true);
 	}
-	request.onreadystatechange = function()
-	{
-		if (this.readyState === 4)
-		{
-			if ((this.status / 100) == 2)
-			{
+	request.onreadystatechange = function() {
+		if (this.readyState === 4) {
+			if ((this.status / 100) == 2) {
 				msgs = JSON.parse(this.responseText);
 				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.
-				if (gt_msg > 0)
-				{
+				if (gt_msg > 0) {
 					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))
-				{
-					if (msgs.length > messages_per_page)
-					{
+				// Otherwise, show us the last 20 messages
+				else {
+					if (msgs.length > messages_per_page) {
 						msgs = msgs.slice(msgs.length - messages_per_page);
 					}
 					new_old_div_name = randomString(5);
-					if (msgs.length < 1)
-					{
+					if (msgs.length < 1) {
 						newlt = lt_msg;
 					}
-					else
-					{
+					else {
 						newlt = msgs[0];
 					}
 					document.getElementById(target_div).innerHTML +=
 						"<div id=\"" + new_old_div_name + "\">" +
+						"<div align=\"center\">" +
 						"<a href=\"javascript:forum_readmessages('" + new_old_div_name + "', 0, " + newlt + ");\">" +
-						"link to msgs less than " + newlt + "</a></div>" ;
+						"<i class=\"fa fa-arrow-circle-up\"></i>&nbsp;&nbsp;" +
+						_("Older posts") + "&nbsp;&nbsp;<i class=\"fa fa-arrow-circle-up\"></a></div></div></a></div></div>" ;
 				}
 
-				// Render the divs (we will fill them in later)
-				for (var i in msgs)
-				{
-					document.getElementById(target_div).innerHTML += "<div id=\"ctdl_msg_" + msgs[i] + "\">#" + msgs[i] + "</div>" ;
+				// Render an empty div for each message.  We will fill them in later.
+				for (var i in msgs) {
+					document.getElementById(target_div).innerHTML += "<div id=\"ctdl_msg_" + msgs[i] + "\"> </div>" ;
+					document.getElementById("ctdl_msg_"+msgs[i]).style.display = "none";
 				}
-				if (lt_msg == 9999999999)
-				{
+				if (lt_msg == 9999999999) {
 					new_new_div_name = randomString(5);
-					if (msgs.length <= 0)
-					{
+					if (msgs.length <= 0) {
 						newgt = gt_msg;
 					}
-					else
-					{
+					else {
 						newgt = msgs[msgs.length-1];
 					}
 					document.getElementById(target_div).innerHTML +=
 						"<div id=\"" + new_new_div_name + "\">" +
+						"<div align=\"center\">" +
 						"<a href=\"javascript:forum_readmessages('" + new_new_div_name + "', " + newgt + ", 9999999999);\">" +
-						"link to msgs greater than " + newgt + "</a></div>" ;
+						"<i class=\"fa fa-arrow-circle-down\"></i>&nbsp;&nbsp;" +
+						_("Newer posts") + "&nbsp;&nbsp;<i class=\"fa fa-arrow-circle-down\"></a></div></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(target_div).innerHTML = "error put it back";
-				alert("ERROR " + this.status + " retrieving messages from server");
+			else {
+				// if xhr fails, this will make the link reappear so the user can try again
+				document.getElementById(target_div).innerHTML = original_text;
 			}
 		}
 	};
@@ -140,13 +145,58 @@ 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)
-	{
-		document.getElementById(prefix + msgs[i]).innerHTML = "<b>Message " + msgs[i] + " got rendered!!!</b>";
+	for (i=0; i<msgs.length; ++i) {
+		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='&lt;i class=&quot;fa fa-user-circle fa-2x&quot;&gt;&lt;/i&gt; '\">"
+				+ "</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";
+			}
+			document.getElementById(div).style.display  = "inline";
+			if (msgnum == scroll_to) {
+				window.location.hash = div;
+			}
+		}
+	};
+	request.send();
+	request = null;
 }
+