X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit-ng%2Fstatic%2Fjs%2Fviews.js;h=fbc8299027a77193d31238d76355677f3fd769c9;hb=8a54abbb5acd0221b0ea367aacbb03b1a8b35ce2;hp=b5d7553377cc08adaf2831ce0dc9ba1ddf14e948;hpb=ac21736a1bf75d8a18234d56447c52afb5f236f3;p=citadel.git
diff --git a/webcit-ng/static/js/views.js b/webcit-ng/static/js/views.js
index b5d755337..fbc829902 100644
--- a/webcit-ng/static/js/views.js
+++ b/webcit-ng/static/js/views.js
@@ -30,15 +30,15 @@ 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(min_msg, max_msg)
+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("ctdl-main", min_msg, max_msg);
+ forum_readmessages("ctdl-main", gt_msg, lt_msg);
break;
default:
document.getElementById("ctdl-main").innerHTML = "The view for " + current_room + " is " + current_view + " but there is no renderer." ;
@@ -50,21 +50,21 @@ function render_room_view(min_msg, max_msg)
// Forum view (flat) -- let's have another go at this with the rendering done client-side
//
-function forum_readmessages(target_div, min_msg, max_msg)
+function forum_readmessages(target_div, gt_msg, lt_msg)
{
- var innerdivname = randomString(5);
- document.getElementById(target_div).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();
- if (max_msg < 9999999999)
+ if (lt_msg < 9999999999)
{
- request.open("GET", "/ctdl/r/" + escapeHTMLURI(current_room) + "/msgs.lt|" + max_msg, true);
+ request.open("GET", "/ctdl/r/" + escapeHTMLURI(current_room) + "/msgs.lt|" + lt_msg, true);
}
else
{
- request.open("GET", "/ctdl/r/" + escapeHTMLURI(current_room) + "/msgs.gt|" + min_msg, true);
+ request.open("GET", "/ctdl/r/" + escapeHTMLURI(current_room) + "/msgs.gt|" + gt_msg, true);
}
request.onreadystatechange = function()
{
@@ -73,17 +73,17 @@ function forum_readmessages(target_div, min_msg, max_msg)
if ((this.status / 100) == 2)
{
msgs = JSON.parse(this.responseText);
- document.getElementById(innerdivname).innerHTML = "" ;
+ document.getElementById(target_div).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.
- if (min_msg > 0)
+ if (gt_msg > 0)
{
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) | (max_msg < 9999999999))
+ // Otherwise, show us the last 20 messages
+ else
{
if (msgs.length > messages_per_page)
{
@@ -92,13 +92,13 @@ function forum_readmessages(target_div, min_msg, max_msg)
new_old_div_name = randomString(5);
if (msgs.length < 1)
{
- newlt = max_msg;
+ newlt = lt_msg;
}
else
{
newlt = msgs[0];
}
- document.getElementById(innerdivname).innerHTML +=
+ document.getElementById(target_div).innerHTML +=
"" ;
@@ -107,44 +107,113 @@ function forum_readmessages(target_div, min_msg, max_msg)
// 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] + "
" ;
- }
+ document.getElementById(target_div).innerHTML += "#" + msgs[i] + "
" ;
}
- if (max_msg == 9999999999)
+ if (lt_msg == 9999999999)
{
new_new_div_name = randomString(5);
if (msgs.length <= 0)
{
- newgt = min_msg;
+ newgt = gt_msg;
}
else
{
newgt = msgs[msgs.length-1];
}
- document.getElementById(innerdivname).innerHTML +=
+ document.getElementById(target_div).innerHTML +=
"" ;
}
- // Render the individual messages in the divs
- for (var i in msgs)
+ // Now figure out where to scroll to after rendering.
+ if (gt_msg > 0)
{
- if ((msgs[i] > min_msg) && (msgs[i] < max_msg))
- {
- document.getElementById("ctdl_msg_" + msgs[i]).innerHTML = "Message " + msgs[i] + " got rendered!!!";
- }
+ scroll_to = msgs[0];
+ }
+ else if (lt_msg < 9999999999)
+ {
+ scroll_to = msgs[msgs.length-1];
+ }
+ else if ( (logged_in) && (gt_msg == 0) && (lt_msg == 9999999999) )
+ {
+ scroll_to = msgs[msgs.length-1];
+ }
+ else
+ {
+ scroll_to = msgs[0]; // FIXME this is too naive
}
+ // Render the individual messages in the divs
+ forum_render_messages(msgs, "ctdl_msg_", scroll_to)
}
else
{
- document.getElementById(innerdivname).innerHTML = "ERROR " + 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, with the div prefix specified
+//
+function forum_render_messages(msgs, prefix, scroll_to)
+{
+ for (i=0; i" // begin message wrapper
+ + "" // begin avatar
+ + " " // FIXME temporary avatar
+ + "
" // end avatar
+ + "" // begin content
+ + "
" // end header
+ + "
" // begin body
+ + msg.text
+ + "
" // end body
+ + "
" // end content
+ + "" // end wrapper
+ ;
+ }
+ else
+ {
+ document.getElementById(div).innerHTML = "ERROR";
+ }
+ if (msgnum == scroll_to)
+ {
+ window.location.hash = div;
+ }
+ }
+ };
+ request.send();
+ request = null;
+}
+