Got it! Temporarily working with the server-side C renderer

[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 743a93ef2589fd01d1ff211f9e73c1a094a9bc89..171fdf93576dc4b3fe54d5c336db5249ef0b6121 100644 (file)
--- a/webcit-ng/static/js/views.js
+++ b/webcit-ng/static/js/views.js
@@ -52,10 +52,10 @@ 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 = "<div id=\"" + innerdivname +
-               "\"><i class=\"fas fa-spinner fa-spin\"></i>&nbsp;&nbsp;"
-               + _("Loading messages from server, please wait") + "</div>" ;
+       original_text = document.getElementById(target_div).innerHTML;          // in case we need to replace it after an error
+       document.getElementById(target_div).innerHTML = 
+               "<i class=\"fas fa-spinner fa-spin\"></i>&nbsp;&nbsp;"
+               + _("Loading messages from server, please wait") ;
 
        var request = new XMLHttpRequest();
        if (lt_msg < 9999999999)
@@ -73,7 +73,7 @@ function forum_readmessages(target_div, gt_msg, lt_msg)
                        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.
@@ -98,7 +98,7 @@ function forum_readmessages(target_div, gt_msg, lt_msg)
                                        {
                                                newlt = msgs[0];
                                        }
-                                       document.getElementById(innerdivname).innerHTML +=
+                                       document.getElementById(target_div).innerHTML +=
                                                "<div id=\"" + new_old_div_name + "\">" +
                                                "<a href=\"javascript:forum_readmessages('" + new_old_div_name + "', 0, " + newlt + ");\">" +
                                                "link to msgs less than " + newlt + "</a></div>" ;
@@ -107,7 +107,7 @@ 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(innerdivname).innerHTML += "<div id=\"ctdl_msg_" + msgs[i] + "\">#" + msgs[i] + "</div>" ;
+                                       document.getElementById(target_div).innerHTML += "<div id=\"ctdl_msg_" + msgs[i] + "\">#" + msgs[i] + "</div>" ;
                                }
                                if (lt_msg == 9999999999)
                                {
@@ -120,7 +120,7 @@ function forum_readmessages(target_div, gt_msg, lt_msg)
                                        {
                                                newgt = msgs[msgs.length-1];
                                        }
-                                       document.getElementById(innerdivname).innerHTML +=
+                                       document.getElementById(target_div).innerHTML +=
                                                "<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>" ;
@@ -131,8 +131,7 @@ function forum_readmessages(target_div, gt_msg, lt_msg)
                        }
                        else
                        {
-                               document.getElementById(innerdivname).innerHTML = "error put it back";
-                               alert("ERROR " + this.status + " retrieving messages from server");
+                               document.getElementById(target_div).innerHTML = original_text;          // this will make the link reappear so the user can try again
                        }
                }
        };
@@ -145,9 +144,33 @@ function forum_readmessages(target_div, gt_msg, lt_msg)
 //
 function render_messages(msgs, prefix, view)
 {
-       for (var i in msgs)
+       for (i=0; i<msgs.length; ++i)
        {
-               document.getElementById(prefix + msgs[i]).innerHTML = "<b>Message " + msgs[i] + " got rendered!!!</b>";
+               render_one(prefix+msgs[i], msgs[i], view);
        }
+}
+
 
+// We have to put each XHR for render_messages() into its own stack frame, otherwise it jumbles them together.  I don't know why.
+function render_one(div, msgnum, view)
+{
+       var request = new XMLHttpRequest();
+       request.open("GET", "/ctdl/r/" + escapeHTMLURI(current_room) + "/" + msgs[i] + "/html", true);
+       request.onreadystatechange = function()
+       {
+               if (this.readyState === 4)
+               {
+                       if ((this.status / 100) == 2)
+                       {
+                               document.getElementById(div).innerHTML = this.responseText;     // FIXME don't let the C server render it.  do JSON now.
+                       }
+                       else
+                       {
+                               document.getElementById(div).innerHTML = "ERROR";
+                       }
+               }
+       };
+       request.send();
+       request = null;
 }
+