X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit-ng%2Fstatic%2Fjs%2Fviews.js;h=eae090ccc075854f51367f2e1d203270a140a086;hb=86ab29cd7358cd0793a2fab867e1432b33acd55d;hp=743a93ef2589fd01d1ff211f9e73c1a094a9bc89;hpb=5573e4f9af0446451635a33adf9ca2846c8d6af8;p=citadel.git
diff --git a/webcit-ng/static/js/views.js b/webcit-ng/static/js/views.js
index 743a93ef2..eae090ccc 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.
@@ -34,14 +34,14 @@ var views = {
//
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", 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;
}
@@ -52,87 +52,89 @@ function render_room_view(gt_msg, lt_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 (lt_msg < 9999999999)
- {
+ if (lt_msg < 9999999999) {
request.open("GET", "/ctdl/r/" + escapeHTMLURI(current_room) + "/msgs.lt|" + lt_msg, true);
}
- else
- {
+ 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)
- {
+ request.onreadystatechange = function() {
+ if (this.readyState === 4) {
+ 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 (gt_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) | (lt_msg < 9999999999))
- {
- 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);
}
new_old_div_name = randomString(5);
- if (msgs.length < 1)
- {
+ if (msgs.length < 1) {
newlt = lt_msg;
}
- else
- {
+ else {
newlt = msgs[0];
}
- document.getElementById(innerdivname).innerHTML +=
- "" +
+ document.getElementById(target_div).innerHTML +=
+ "
" ;
}
// Render the divs (we will fill them in later)
- for (var i in msgs)
- {
- document.getElementById(innerdivname).innerHTML += "
#" + msgs[i] + "
" ;
+ for (var i in msgs) {
+ document.getElementById(target_div).innerHTML +=
+ "
#" + msgs[i]
+ + "
" ;
}
- if (lt_msg == 9999999999)
- {
+ if (lt_msg == 9999999999) {
new_new_div_name = randomString(5);
- if (msgs.length <= 0)
- {
+ if (msgs.length <= 0) {
newgt = gt_msg;
}
- else
- {
+ else {
newgt = msgs[msgs.length-1];
}
- document.getElementById(innerdivname).innerHTML +=
- "
" ;
+ document.getElementById(target_div).innerHTML +=
+ "
" ;
+ }
+
+ // 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];
+ }
+ else {
+ scroll_to = msgs[0]; // FIXME this is too naive
}
// Render the individual messages in the divs
- render_messages(msgs, "ctdl_msg_", views.VIEW_BBS);
+ forum_render_messages(msgs, "ctdl_msg_", scroll_to)
}
- else
- {
- document.getElementById(innerdivname).innerHTML = "error put it back";
- alert("ERROR " + this.status + " retrieving messages from server");
+ else {
+ // if xhr fails, this will make the link reappear so the user can try again
+ document.getElementById(target_div).innerHTML = original_text;
}
}
};
@@ -141,13 +143,57 @@ function forum_readmessages(target_div, gt_msg, lt_msg)
}
-// Render a range of messages, in the view specified, with the div prefix specified
+// Render a range of messages, with the div prefix specified
//
-function render_messages(msgs, prefix, view)
+function forum_render_messages(msgs, prefix, scroll_to)
{
- for (var i in msgs)
- {
- document.getElementById(prefix + msgs[i]).innerHTML = "
Message " + msgs[i] + " got rendered!!!";
+ 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(div).innerHTML = "ERROR";
+ }
+ if (msgnum == scroll_to) {
+ window.location.hash = div;
+ }
+ }
+ };
+ request.send();
+ request = null;
}
+