From a31e747f369e87522b74e867262b7929de4897f9 Mon Sep 17 00:00:00 2001
From: Art Cancro <ajc@citadel.org>
Date: Tue, 13 Feb 2018 18:01:59 -0500
Subject: [PATCH] reshufflize the parameters to room renderers

---
 webcit-ng/static/index.html  |  2 +-
 webcit-ng/static/js/login.js |  4 +--
 webcit-ng/static/js/main.js  |  2 +-
 webcit-ng/static/js/views.js | 51 ++++++++----------------------------
 4 files changed, 15 insertions(+), 44 deletions(-)

diff --git a/webcit-ng/static/index.html b/webcit-ng/static/index.html
index e7cb79980..7bac73bd0 100644
--- a/webcit-ng/static/index.html
+++ b/webcit-ng/static/index.html
@@ -64,7 +64,7 @@
 <div class="w3-overlay w3-hide-large w3-animate-opacity" onclick="w3_close()" style="cursor:pointer" title="close side menu" id="myOverlay"></div>
 
 <!-- MAIN PAGE CONTENT DIV -->
-<div id="main" class="w3-main" style="margin-left:300px;margin-top:43px;">
+<div id="ctdl-main" class="w3-main" style="margin-left:300px;margin-top:43px;">
 
 die in a car fire
 
diff --git a/webcit-ng/static/js/login.js b/webcit-ng/static/js/login.js
index ba2dbff7e..699e41498 100644
--- a/webcit-ng/static/js/login.js
+++ b/webcit-ng/static/js/login.js
@@ -12,7 +12,7 @@
 
 function display_login_screen(any_message)
 {
-	document.getElementById("main").innerHTML =
+	document.getElementById("ctdl-main").innerHTML =
 		"<center><br><br>Put the login screen here, dummary<br><br>" +
 		any_message + "<br><br>" +
 		"<table border=0><tr><td>" +
@@ -62,7 +62,7 @@ function login_result(data)
 		logged_in = 1;
 		current_user = data.substring(4).split("|")[0];
 		update_banner();
-		document.getElementById("main").innerHTML = "FIXME ok we are logged in as " + current_user + " ... " ;
+		document.getElementById("ctdl-main").innerHTML = "FIXME ok we are logged in as " + current_user + " ... " ;
 	}
 	else {
 		display_login_screen(data.substring(4));
diff --git a/webcit-ng/static/js/main.js b/webcit-ng/static/js/main.js
index 0170a987a..0208866c4 100644
--- a/webcit-ng/static/js/main.js
+++ b/webcit-ng/static/js/main.js
@@ -201,5 +201,5 @@ function gotoroom_2(data) {
 	default_view = data.default_view;
 	last_seen = data.last_seen;
 	update_banner();
-	render_room_view();
+	render_room_view(0, Number.MAX_VALUE);
 }
diff --git a/webcit-ng/static/js/views.js b/webcit-ng/static/js/views.js
index b569cd664..d62af2cb8 100644
--- a/webcit-ng/static/js/views.js
+++ b/webcit-ng/static/js/views.js
@@ -32,65 +32,33 @@ var views = {
 // This function is the dispatcher that determines the correct view for a room,
 // and calls the correct renderer.
 //
-function render_room_view()
+function render_room_view(min_msg, max_msg)
 {
 	switch(current_view)
 	{
 		case views.VIEW_MAILBOX:						// FIXME view mail rooms as forums for now
 		case views.VIEW_BBS:
-			forum_readmessages();
+			forum_readmessages("ctdl-main", min_msg, max_msg);
 			break;
 		default:
-			document.getElementById("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;
 	}
 
 }
 
 
-// Forum view -- flat or threaded
-// The inner div exists so that if the user clicks away early, the main div doesn't get clobbered when the load completes.
-// The parameter can be set to "flat" or "threads" which is passed directly to the API
-//
-function XX_forum_readmessages(flat_or_threads)
-{
-	var innerdivname = randomString(5);
-	document.getElementById("main").innerHTML = "<div id=\"" + innerdivname +
-		"\"><br><br><br><center><h5><i class=\"fas fa-spinner fa-spin\"></i>&nbsp;&nbsp;"
-		+ _("Loading messages from server, please wait") + "</h5></center></div>" ;
-
-	var request = new XMLHttpRequest();
-	request.open("GET", "/ctdl/r/" + escapeHTMLURI(current_room) + "/" + flat_or_threads, true);
-	request.onreadystatechange = function()
-	{
-		if (this.readyState === 4)
-		{
-			if ((this.status / 100) == 2)
-			{
-				document.getElementById(innerdivname).outerHTML = this.responseText;
-			}
-			else
-			{
-				document.getElementById(innerdivname).outerHTML = "ERROR " + this.status ;
-			}
-		}
-	};
-	request.send();
-	request = null;
-}
-
-
 // Forum view (flat) -- let's have another go at this with the rendering done client-side
 //
-function forum_readmessages()
+function forum_readmessages(target_div, min_msg, max_msg)
 {
 	var innerdivname = randomString(5);
-	document.getElementById("main").innerHTML = "<div id=\"" + innerdivname +
+	document.getElementById(target_div).innerHTML = "<div id=\"" + innerdivname +
 		"\"><br><br><br><center><h5><i class=\"fas fa-spinner fa-spin\"></i>&nbsp;&nbsp;"
 		+ _("Loading messages from server, please wait") + "</h5></center></div>" ;
 
 	var request = new XMLHttpRequest();
-	request.open("GET", "/ctdl/r/" + escapeHTMLURI(current_room) + "/msgs.all", true);
+	request.open("GET", "/ctdl/r/" + escapeHTMLURI(current_room) + "/msgs.gt|" + min_msg, true);
 	request.onreadystatechange = function()
 	{
 		if (this.readyState === 4)
@@ -101,7 +69,9 @@ function forum_readmessages()
 				document.getElementById(innerdivname).innerHTML =
 					"Are we logged in? " + logged_in + "<br>"
 					+ "Last seen: " + last_seen + "<br>"
-					+ "Number of messages: " + msgs.length + "<br>" ;
+					+ "Number of messages: " + msgs.length + "<br>"
+					+ "min_msg=" + min_msg + "<br>"
+					+ "max_msg=" + max_msg + "<br>" ;
 
 				if (msgs.length == 0)
 				{
@@ -120,7 +90,8 @@ function forum_readmessages()
 
 				for (var i in msgs)
 				{
-					document.getElementById(innerdivname).innerHTML += "message # " + msgs[i] + "<br>" ;
+					document.getElementById(innerdivname).innerHTML +=
+						"<div id=\"ctdl_msg_" + msgs[i] + "\">message #" + msgs[i] + "</div>" ;
 				}
 			}
 			else
-- 
2.30.2