Fix odd case of median

[reliable-chat] / webclient / rc.html

diff --git a/webclient/rc.html b/webclient/rc.html
index c3284da03b1480583a40cfb4eb93b0d332d22196..e497135b1776c630445b0a5819add40abf6404aa 100644 (file)
--- a/webclient/rc.html
+++ b/webclient/rc.html
@@ -148,9 +148,11 @@
                        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 text = (message.Time ? rcformattime(message.Time) : "") + " " + message.Text;
+                       message.UI = document.createElement("div");
+                       message.UI.appendChild(document.createTextNode(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 +173,21 @@
                        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);
+               }

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