X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit-ng%2Fstatic%2Fjs%2Fviews.js;h=35fdbef5bc7f38abce720bd46d93d0824ef9379b;hb=439dbc67ce2cb6923a35efbd4c172ea3f5f83bf4;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..35fdbef5b 100644
--- a/webcit-ng/static/js/views.js
+++ b/webcit-ng/static/js/views.js
@@ -1,5 +1,5 @@
//
-// Copyright (c) 2016-2018 by the citadel.org team
+// Copyright (c) 2016-2019 by the citadel.org team
//
// This program is open source software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License version 3.
@@ -30,18 +30,18 @@ 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)
- {
+ 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." ;
+ document.getElementById("ctdl-main").innerHTML =
+ "The view for " + current_room + " is " + current_view + " but there is no renderer." ;
break;
}
@@ -50,65 +50,154 @@ 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();
- request.open("GET", "/ctdl/r/" + escapeHTMLURI(current_room) + "/msgs.gt|" + min_msg, true);
- request.onreadystatechange = function()
- {
- if (this.readyState === 4)
- {
- if ((this.status / 100) == 2)
- {
+ 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) {
+ 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(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.
- else if (min_msg > 0)
- {
- msgs = msgs.slice(0, msgs_per_page);
+ 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))
- {
- if (msgs.length > messages_per_page)
- {
+ // Otherwise, show us the last 20 messages
+ else {
+ 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(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 +=
+ "" ;
}
- for (var i in msgs)
- {
- document.getElementById(innerdivname).innerHTML +=
- "message #" + msgs[i] + "
" ;
+ // Now figure out where to scroll to after rendering.
+ if (gt_msg > 0) {
+ 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];
}
- document.getElementById(innerdivname).innerHTML += "link to msgs greater than " + 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 {
+ // if xhr fails, this will make the link reappear so the user can try again
+ document.getElementById(target_div).innerHTML = original_text;
+ }
+ }
+ };
+ 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
+ + "
"
+ + "
" // end avatar
+ + "" // begin content
+ + "" // end header
+ + "
" // begin body
+ + msg.text
+ + "
" // end body
+ + "
" // end content
+ + "" // end wrapper
+ ;
}
- else
- {
- document.getElementById(innerdivname).innerHTML = this.status ; // error message
+ else {
+ document.getElementById(div).innerHTML = "ERROR";
+ }
+ if (msgnum == scroll_to) {
+ window.location.hash = div;
}
}
};
request.send();
request = null;
}
+