Take UI creation out of rcaddmessagetohistory

[reliable-chat] / webclient / rc.html

diff --git a/webclient/rc.html b/webclient/rc.html
index c3284da03b1480583a40cfb4eb93b0d332d22196..840851c12f39ecd4be0bcc6944728ec14531e877 100644 (file)
--- a/webclient/rc.html
+++ b/webclient/rc.html
@@ -56,6 +56,13 @@
                padding: 0px 5px 55px 5px;
                vertical-align: bottom
        }
                padding: 0px 5px 55px 5px;
                vertical-align: bottom
        }

+       .servercount {
+               margin-right: 0.5em;
+               font-size: 70%;
+       }
+       .timestamp {
+               margin-right: 0.8em;
+       }

        img { width: 1px; height: 1px; }
        iframe { display: none }
        #status span { margin-right: 10px; }
        img { width: 1px; height: 1px; }
        iframe { display: none }
        #status span { margin-right: 10px; }


@@ -133,6 +140,25 @@
                return d + " " + pad(h) + ":" + pad(m) + ":" + pad(s);
        }
 
                return d + " " + pad(h) + ":" + pad(m) + ":" + pad(s);
        }
 

+       function rcmakemessageUI(message) {
+               message.UI = document.createElement("div");
+
+               // Server count
+               var servercount = document.createElement("span");
+               servercount.setAttribute("class", "servercount");
+               servercount.appendChild(document.createTextNode(Object.keys(message.ServerTimes).length));
+               message.UI.appendChild(servercount);
+
+               // Timestamp
+               var timestamp_text = message.Time ? rcformattime(message.Time) : "";
+               var timestamp = document.createElement("span");
+               timestamp.setAttribute("class", "timestamp");
+               timestamp.appendChild(document.createTextNode(timestamp_text));
+               message.UI.appendChild(timestamp);
+
+               message.UI.appendChild(document.createTextNode(message.Text));
+       }
+

        function rcaddmessagetohistory(message) {
                var message_i;
                if (message.Time) {
        function rcaddmessagetohistory(message) {
                var message_i;
                if (message.Time) {


@@ -148,9 +174,9 @@
                        message_i = history.length-1;
                }
 
                        message_i = history.length-1;
                }
 

-               var text = (message.Time ? rcformattime(message.Time) : "") + " " + message.Text;
-               message.UI = document.createElement("div");
-               message.UI.appendChild(document.createTextNode(text));
+               if (!message.UI) {
+                       rcmakemessageUI(message);
+               }

                var h = document.getElementById("history");
                if (message_i + 1 < history.length) {
                        h.insertBefore(message.UI, history[message_i + 1].UI);
                var h = document.getElementById("history");
                if (message_i + 1 < history.length) {
                        h.insertBefore(message.UI, history[message_i + 1].UI);


@@ -171,13 +197,34 @@
                        times.push(message.ServerTimes[i]);
                }
                times.sort();
                        times.push(message.ServerTimes[i]);
                }
                times.sort();

-               var middle = times.length/2;

                if (times.length % 2) {
                if (times.length % 2) {

-                       message.Time = times[middle];
+                       message.Time = times[(times.length-1)/2];

                } else {
                } else {

+                       var middle = times.length/2;

                        var difference = times[middle].getTime() - times[middle-1].getTime();
                        message.Time = new Date(times[middle-1].getTime() + difference/2);
                }
                        var difference = times[middle].getTime() - times[middle-1].getTime();
                        message.Time = new Date(times[middle-1].getTime() + difference/2);
                }

+
+               // This may have broken history's in-sorted-order invariant
+               var hi = history.indexOf(message);
+               if ((history[hi-1] && history[hi-1].Time > message.Time) ||
+                   (history[hi+1] && history[hi+1].Time < message.Time)) {
+                       history.splice(hi,1);
+                       rcaddmessagetohistory(message);
+               }
+
+               // Update the UI
+               var spans = message.UI.getElementsByTagName("span");
+               for (var i in spans) {
+                       if (spans[i].getAttribute) {
+                               var type = spans[i].getAttribute("class");
+                               if (type == "servercount") {
+                                       spans[i].firstChild.data = Object.keys(message.ServerTimes).length;
+                               } else if (type == "timestamp") {
+                                       spans[i].firstChild.data = rcformattime(message.Time);
+                               }
+                       }
+               }

        }
 
        function rcreceivemessages(server, messages) {
        }
 
        function rcreceivemessages(server, messages) {