X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit-ng%2Fstatic%2Fjs%2Fviews.js;h=12642210f40a46b3b65b7ecd6e3bc32c4347e038;hb=d41e1a56e4f10994ea88d2dd3680f273c4e8eb8d;hp=b569cd6640c1ce73e60bbadea721d36671ceca48;hpb=32fe7887a4fc68e8148f79c4b9ec35ffbb2442d7;p=citadel.git
diff --git a/webcit-ng/static/js/views.js b/webcit-ng/static/js/views.js
index b569cd664..12642210f 100644
--- a/webcit-ng/static/js/views.js
+++ b/webcit-ng/static/js/views.js
@@ -30,67 +30,42 @@ var views = {
// This function is the dispatcher that determines the correct view for a room,
-// and calls the correct renderer.
+// and calls the correct renderer. Greater/Less than bounds are accepted.
//
-function render_room_view()
+function render_room_view(gt_msg, lt_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", gt_msg, lt_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, gt_msg, lt_msg)
{
- var innerdivname = randomString(5);
- document.getElementById("main").innerHTML = "
"
- + _("Loading messages from server, please wait") + "
" ;
+ original_text = document.getElementById(target_div).innerHTML; // in case we need to replace it after an error
+ document.getElementById(target_div).innerHTML =
+ " "
+ + _("Loading messages from server, please wait") ;
var request = new XMLHttpRequest();
- request.open("GET", "/ctdl/r/" + escapeHTMLURI(current_room) + "/msgs.all", true);
+ if (lt_msg < 9999999999)
+ {
+ request.open("GET", "/ctdl/r/" + escapeHTMLURI(current_room) + "/msgs.lt|" + lt_msg, true);
+ }
+ else
+ {
+ request.open("GET", "/ctdl/r/" + escapeHTMLURI(current_room) + "/msgs.gt|" + gt_msg, true);
+ }
request.onreadystatechange = function()
{
if (this.readyState === 4)
@@ -98,37 +73,80 @@ function forum_readmessages()
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 + "
" ;
+ document.getElementById(target_div).innerHTML = "" ;
- if (msgs.length == 0)
+ // 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)
{
- document.getElementById(innerdivname).innerHTML += "FIXME no msgs" ;
+ 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) | (lt_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 = lt_msg;
+ }
+ else
+ {
+ newlt = msgs[0];
+ }
+ document.getElementById(target_div).innerHTML +=
+ "" ;
}
+ // Render the divs (we will fill them in later)
for (var i in msgs)
{
- document.getElementById(innerdivname).innerHTML += "message # " + msgs[i] + "
" ;
+ document.getElementById(target_div).innerHTML += "#" + msgs[i] + "
" ;
+ }
+ if (lt_msg == 9999999999)
+ {
+ new_new_div_name = randomString(5);
+ if (msgs.length <= 0)
+ {
+ newgt = gt_msg;
+ }
+ else
+ {
+ newgt = msgs[msgs.length-1];
+ }
+ document.getElementById(target_div).innerHTML +=
+ "" ;
}
+
+ // Render the individual messages in the divs
+ render_messages(msgs, "ctdl_msg_", views.VIEW_BBS);
}
else
{
- document.getElementById(innerdivname).innerHTML = this.status ; // error message
+ document.getElementById(target_div).innerHTML = original_text; // this will make the link reappear so the user can try again
}
}
};
request.send();
request = null;
}
+
+
+// Render a range of messages, in the view specified, with the div prefix specified
+//
+function render_messages(msgs, prefix, view)
+{
+ for (var i in msgs)
+ {
+ document.getElementById(prefix + msgs[i]).innerHTML = "Message " + msgs[i] + " got rendered!!!";
+ }
+
+}