From c2130254167cb73d7841fde1ba8536de3bac469a Mon Sep 17 00:00:00 2001 From: Art Cancro Date: Wed, 14 Feb 2018 11:57:58 -0500 Subject: [PATCH] older and newer --- webcit-ng/static/js/main.js | 2 +- webcit-ng/static/js/views.js | 47 ++++++++++++++++++++++++------------ 2 files changed, 33 insertions(+), 16 deletions(-) diff --git a/webcit-ng/static/js/main.js b/webcit-ng/static/js/main.js index 0208866c4..1e49b2b82 100644 --- a/webcit-ng/static/js/main.js +++ b/webcit-ng/static/js/main.js @@ -201,5 +201,5 @@ function gotoroom_2(data) { default_view = data.default_view; last_seen = data.last_seen; update_banner(); - render_room_view(0, Number.MAX_VALUE); + render_room_view(0, 9999999999); } diff --git a/webcit-ng/static/js/views.js b/webcit-ng/static/js/views.js index 7ad2a6b92..bb8f88e69 100644 --- a/webcit-ng/static/js/views.js +++ b/webcit-ng/static/js/views.js @@ -58,7 +58,14 @@ function forum_readmessages(target_div, min_msg, max_msg) + _("Loading messages from server, please wait") + "" ; var request = new XMLHttpRequest(); - request.open("GET", "/ctdl/r/" + escapeHTMLURI(current_room) + "/msgs.gt|" + min_msg, true); + if (max_msg < 9999999999) + { + request.open("GET", "/ctdl/r/" + escapeHTMLURI(current_room) + "/msgs.lt|" + max_msg, true); + } + else + { + request.open("GET", "/ctdl/r/" + escapeHTMLURI(current_room) + "/msgs.gt|" + min_msg, true); + } request.onreadystatechange = function() { if (this.readyState === 4) @@ -67,41 +74,51 @@ function forum_readmessages(target_div, min_msg, max_msg) { 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 + "
" ; + 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" ; - } + //if (msgs.length == 0) + //{ + //document.getElementById(innerdivname).innerHTML += "FIXME no msgs" ; + //} // 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) + if (min_msg > 0) { msgs = msgs.slice(0, msgs_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) | (max_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] + "
" ; } + document.getElementById(innerdivname).innerHTML += + "
" + + "" + + "link to msgs less than " + msgs[0] + "
" ; } + // It's render time, bitchez! for (var i in msgs) { document.getElementById(innerdivname).innerHTML += "
message #" + msgs[i] + "
" ; } - document.getElementById(innerdivname).innerHTML += "
link to msgs greater than " + msgs[msgs.length-1] + "
" ; + if (max_msg == 9999999999) + { + document.getElementById(innerdivname).innerHTML += + "
" + + "" + + "link to msgs greater than " + msgs[msgs.length-1] + "
" ; + } } else { -- 2.30.2