X-Git-Url: https://code.citadel.org/?p=citadel.git;a=blobdiff_plain;f=webcit-ng%2Fstatic%2Fjs%2Fviews.js;h=bb8f88e69a959f21722f5289c4725c7077b9b24b;hp=7ad2a6b921600ef2d12cd44d3f4337bd75584b26;hb=c2130254167cb73d7841fde1ba8536de3bac469a;hpb=d62e89645b97e92bfec2bc71995530ac732ebd63
diff --git a/webcit-ng/static/js/views.js b/webcit-ng/static/js/views.js
index 7ad2a6b92..bb8f88e69 100644
--- a/webcit-ng/static/js/views.js
+++ b/webcit-ng/static/js/views.js
@@ -58,7 +58,14 @@ function forum_readmessages(target_div, min_msg, max_msg)
+ _("Loading messages from server, please wait") + "" ;
var request = new XMLHttpRequest();
- request.open("GET", "/ctdl/r/" + escapeHTMLURI(current_room) + "/msgs.gt|" + min_msg, true);
+ if (max_msg < 9999999999)
+ {
+ request.open("GET", "/ctdl/r/" + escapeHTMLURI(current_room) + "/msgs.lt|" + max_msg, true);
+ }
+ else
+ {
+ request.open("GET", "/ctdl/r/" + escapeHTMLURI(current_room) + "/msgs.gt|" + min_msg, true);
+ }
request.onreadystatechange = function()
{
if (this.readyState === 4)
@@ -67,41 +74,51 @@ function forum_readmessages(target_div, min_msg, max_msg)
{
msgs = JSON.parse(this.responseText);
- document.getElementById(innerdivname).innerHTML =
- "Are we logged in? " + logged_in + "
"
- + "Last seen: " + last_seen + "
"
- + "Number of messages: " + msgs.length + "
"
- + "min_msg=" + min_msg + "
"
- + "max_msg=" + max_msg + "
" ;
+ document.getElementById(innerdivname).innerHTML = "" ;
+ //"Are we logged in? " + logged_in + "
"
+ //+ "Last seen: " + last_seen + "
"
+ //+ "Number of messages: " + msgs.length + "
"
+ //+ "min_msg=" + min_msg + "
"
+ //+ "max_msg=" + max_msg + "
" ;
- if (msgs.length == 0)
- {
- document.getElementById(innerdivname).innerHTML += "FIXME no msgs" ;
- }
+ //if (msgs.length == 0)
+ //{
+ //document.getElementById(innerdivname).innerHTML += "FIXME no msgs" ;
+ //}
// 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.
- else if (min_msg > 0)
+ if (min_msg > 0)
{
msgs = msgs.slice(0, msgs_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))
+ else if ((logged_in) | (!logged_in) | (max_msg < 9999999999))
{
if (msgs.length > messages_per_page)
{
msgs = msgs.slice(msgs.length - messages_per_page);
- document.getElementById(innerdivname).innerHTML += "