I think we finally have the older/newer messages buttons functioning properly.

[citadel.git] / webcit-ng / static / js / views.js

diff --git a/webcit-ng/static/js/views.js b/webcit-ng/static/js/views.js
index d62af2cb83b1be2312ce5afc28c7670f58456747..b3b8212316d40f5d69a690b4506c136ae1c0dead 100644 (file)
--- 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") + "</h5></center></div>" ;
 
        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)
@@ -66,32 +73,53 @@ function forum_readmessages(target_div, min_msg, max_msg)
                        if ((this.status / 100) == 2)
                        {
                                msgs = JSON.parse(this.responseText);
-                               document.getElementById(innerdivname).innerHTML =
-                                       "Are we logged in? " + logged_in + "<br>"
-                                       + "Last seen: " + last_seen + "<br>"
-                                       + "Number of messages: " + msgs.length + "<br>"
-                                       + "min_msg=" + min_msg + "<br>"
-                                       + "max_msg=" + max_msg + "<br>" ;
+                               document.getElementById(innerdivname).innerHTML = "" ;
 
-                               if (msgs.length == 0)
+                               // 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)
                                {
-                                               document.getElementById(innerdivname).innerHTML += "FIXME no msgs" ;
+                                       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))
+                               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] + "<br>" ;
                                        }
+                                       new_old_div_name = randomString(5);
+                                       document.getElementById(innerdivname).innerHTML +=
+                                               "<div id=\"" + new_old_div_name + "\">" +
+                                               "<a href=\"javascript:forum_readmessages('" + new_old_div_name + "', 0, " + msgs[0] + ");\">" +
+                                               "link to msgs less than " + msgs[0] + "</a></div>" ;
                                }
 
+                               // It's render time, bitchez!
                                for (var i in msgs)
                                {
+                                       if ((msgs[i] > min_msg) && (msgs[i] < max_msg))
+                                       {
+                                               document.getElementById(innerdivname).innerHTML +=
+                                                       "<div id=\"ctdl_msg_" + msgs[i] + "\">message #" + msgs[i] + "</div>" ;
+                                       }
+                               }
+                               if (max_msg == 9999999999)
+                               {
+                                       new_new_div_name = randomString(5);
+                                       if (msgs.length <= 0)
+                                       {
+                                               newgt = min_msg;
+                                       }
+                                       else
+                                       {
+                                               newgt = msgs[msgs.length-1];
+                                       }
                                        document.getElementById(innerdivname).innerHTML +=
-                                               "<div id=\"ctdl_msg_" + msgs[i] + "\">message #" + msgs[i] + "</div>" ;
+                                               "<div id=\"" + new_new_div_name + "\">" +
+                                               "<a href=\"javascript:forum_readmessages('" + new_new_div_name + "', " + newgt + ", 9999999999);\">" +
+                                               "link to msgs greater than " + newgt + "</a></div>" ;
                                }
                        }
                        else