X-Git-Url: https://code.citadel.org/?p=citadel.git;a=blobdiff_plain;f=webcit-ng%2Fstatic%2Fjs%2Fviews.js;h=d62af2cb83b1be2312ce5afc28c7670f58456747;hp=b569cd6640c1ce73e60bbadea721d36671ceca48;hb=a31e747f369e87522b74e867262b7929de4897f9;hpb=5deb2bab5f248ea677c98d8b36b3d658520324ed
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 = "
"
- + _("Loading messages from server, please wait") + "
" ;
-
- 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 = "
"
+ _("Loading messages from server, please wait") + "
" ;
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 + "
"
+ "Last seen: " + last_seen + "
"
- + "Number of messages: " + msgs.length + "
" ;
+ + "Number of messages: " + msgs.length + "
"
+ + "min_msg=" + min_msg + "
"
+ + "max_msg=" + max_msg + "
" ;
if (msgs.length == 0)
{
@@ -120,7 +90,8 @@ function forum_readmessages()
for (var i in msgs)
{
- document.getElementById(innerdivname).innerHTML += "message # " + msgs[i] + "
" ;
+ document.getElementById(innerdivname).innerHTML +=
+ "message #" + msgs[i] + "
" ;
}
}
else