X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit-ng%2Fstatic%2Fjs%2Fviews.js;h=b5d7553377cc08adaf2831ce0dc9ba1ddf14e948;hb=ac21736a1bf75d8a18234d56447c52afb5f236f3;hp=7ad2a6b921600ef2d12cd44d3f4337bd75584b26;hpb=d62e89645b97e92bfec2bc71995530ac732ebd63;p=citadel.git
diff --git a/webcit-ng/static/js/views.js b/webcit-ng/static/js/views.js
index 7ad2a6b92..b5d755337 100644
--- a/webcit-ng/static/js/views.js
+++ b/webcit-ng/static/js/views.js
@@ -54,11 +54,18 @@ function forum_readmessages(target_div, min_msg, max_msg)
{
var innerdivname = randomString(5);
document.getElementById(target_div).innerHTML = "
"
- + _("Loading messages from server, please wait") + "
" ;
+ "\"> "
+ + _("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)
@@ -66,46 +73,75 @@ function forum_readmessages(target_div, min_msg, max_msg)
if ((this.status / 100) == 2)
{
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 + "
" ;
-
- if (msgs.length == 0)
- {
- document.getElementById(innerdivname).innerHTML += "FIXME no msgs" ;
- }
+ document.getElementById(innerdivname).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.
- else if (min_msg > 0)
+ if (min_msg > 0)
{
- msgs = msgs.slice(0, msgs_per_page);
+ 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))
+ 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 += "link to msgs less than " + msgs[0] + "
" ;
}
+ new_old_div_name = randomString(5);
+ if (msgs.length < 1)
+ {
+ newlt = max_msg;
+ }
+ else
+ {
+ newlt = msgs[0];
+ }
+ document.getElementById(innerdivname).innerHTML +=
+ "" ;
}
+ // Render the divs (we will fill them in later)
for (var i in msgs)
{
+ if ((msgs[i] > min_msg) && (msgs[i] < max_msg))
+ {
+ document.getElementById(innerdivname).innerHTML += "#" + msgs[i] + "
" ;
+ }
+ }
+ if (max_msg == 9999999999)
+ {
+ new_new_div_name = randomString(5);
+ if (msgs.length <= 0)
+ {
+ newgt = min_msg;
+ }
+ else
+ {
+ newgt = msgs[msgs.length-1];
+ }
document.getElementById(innerdivname).innerHTML +=
- "message #" + msgs[i] + "
" ;
+ "" ;
}
- document.getElementById(innerdivname).innerHTML += "link to msgs greater than " + msgs[msgs.length-1] + "
" ;
+
+ // Render the individual messages in the divs
+ for (var i in msgs)
+ {
+ if ((msgs[i] > min_msg) && (msgs[i] < max_msg))
+ {
+ document.getElementById("ctdl_msg_" + msgs[i]).innerHTML = "Message " + msgs[i] + " got rendered!!!";
+ }
+ }
+
}
else
{
- document.getElementById(innerdivname).innerHTML = this.status ; // error message
+ document.getElementById(innerdivname).innerHTML = "ERROR " + this.status ; // error message
}
}
};