Feed the median-timestamp updates back into the UI

[reliable-chat] / webclient / rc.html

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

+       .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; }


@@ -148,9 +151,15 @@
                        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) {
+                       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 = document.createElement("div");
+                       message.UI.appendChild(timestamp);
+                       message.UI.appendChild(document.createTextNode(message.Text));
+               }

                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 +180,29 @@
                        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 && spans[i].getAttribute("class") == "timestamp") {
+                               spans[i].firstChild.data = rcformattime(message.Time);
+                       }
+               }

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