X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit-ng%2Fstatic%2Fjs%2Fviews.js;h=549ff1d47b8c393cc340b2e4b4ebe67578caac46;hb=fc9eaf2e70bad8b188727db02c610155cabff931;hp=7e10e3668b5d3b79a2499d9e79a826c20adacfe5;hpb=b1294d16d0b3ebc7ce5b9b47cc5e1cdf64e1896c;p=citadel.git diff --git a/webcit-ng/static/js/views.js b/webcit-ng/static/js/views.js index 7e10e3668..549ff1d47 100644 --- a/webcit-ng/static/js/views.js +++ b/webcit-ng/static/js/views.js @@ -41,7 +41,8 @@ function render_room_view(gt_msg, lt_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; } @@ -52,6 +53,7 @@ function render_room_view(gt_msg, lt_msg) // function forum_readmessages(target_div, gt_msg, lt_msg) { + 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") ; @@ -81,8 +83,8 @@ function forum_readmessages(target_div, gt_msg, lt_msg) 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)) + // Otherwise, show us the last 20 messages + else { if (msgs.length > messages_per_page) { @@ -106,7 +108,10 @@ function forum_readmessages(target_div, gt_msg, lt_msg) // Render the divs (we will fill them in later) for (var i in msgs) { - document.getElementById(target_div).innerHTML += "