Pass message on *after* setting since.

[reliable-chat] / webclient / rc.html

diff --git a/webclient/rc.html b/webclient/rc.html
index 97491cdc885decba9854a7c0a0b000f55b56dae2..0dd591c11f3ac9c3a264ada813232136dd742a49 100644 (file)
--- a/webclient/rc.html
+++ b/webclient/rc.html
@@ -114,9 +114,22 @@
                }
        }
 
+       function rcformattime(t) {
+               var d = t.getDay();
+               d = ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"][d];
+               var h = t.getHours();
+               var m = t.getMinutes();
+               var s = t.getSeconds();
+               function pad(x) {
+                       return (x < 10 ? "0" : "") + x;
+               }
+               return d + " " + pad(h) + ":" + pad(m) + ":" + pad(s);
+       }
+
        function rcaddmessagetohistory(message) {
                var d = document.createElement("div");
-               d.appendChild(document.createTextNode(message.Text));
+               var text = (message.Time ? rcformattime(message.Time) : "") + " " + message.Text;
+               d.appendChild(document.createTextNode(text));
                var h = document.getElementById("history");
                h.appendChild(d);
                window.scrollTo(0, document.body.scrollHeight);
@@ -130,6 +143,7 @@
        function rcreceivemessages(server, messages) {
                for (var i in messages) {
                        var m = messages[i];
+                       m.Time = new Date(m.Time);
                        var seen_key = make_seen_key(m.ID, m.Text);
                        if (!(seen_key in seen)) {
                                seen[seen_key] = true;
@@ -152,11 +166,11 @@
                                        if (rtxt != null) {
                                                var messages = JSON.parse(rtxt);
                                                if (messages != null) {
-                                                       rcreceivemessages(server, messages);
                                                        delay = 40;
                                                        if (messages.length >= 1 && "Time" in messages[messages.length-1]) {
                                                                since[server] = messages[messages.length-1].Time;
                                                        }
+                                                       rcreceivemessages(server, messages);
                                                }
                                        }
                                }