From: Scott Worley <sworley@chkno.net>
Date: Fri, 3 Aug 2012 18:51:03 +0000 (-0700)
Subject: Preserve history's in-order invariant
X-Git-Url: http://git.scottworley.com/reliable-chat/commitdiff_plain/95ba71eedb7e9e9290c817bc7432b50ee6808558?ds=sidebyside

Preserve history's in-order invariant

In rcupdatemessagetime().
---

diff --git a/webclient/rc.html b/webclient/rc.html
index c3284da..27dba59 100644
--- a/webclient/rc.html
+++ b/webclient/rc.html
@@ -148,9 +148,11 @@
 			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);
@@ -178,6 +180,14 @@
 			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) {