]> git.scottworley.com Git - reliable-chat/commitdiff
Rename "history" to "hist"
authorScott Worley <scottworley@scottworley.com>
Thu, 23 Jul 2015 06:46:52 +0000 (23:46 -0700)
committerScott Worley <scottworley@scottworley.com>
Thu, 23 Jul 2015 06:46:52 +0000 (23:46 -0700)
Apparently there's now a top-level "history" object that interferes with
this usage.

webclient/rc.html

index e4bdb2de89ae70ef7e8e981dd2aed01c709dcf31..7689e4b07187a488b315ae5545392b830a45ba60 100644 (file)
        var session = Math.random();  // For outgoing message IDs
        var since = {};    // server -> time: For fetch?since=
        var seen = {};     // seen_key -> message
        var session = Math.random();  // For outgoing message IDs
        var since = {};    // server -> time: For fetch?since=
        var seen = {};     // seen_key -> message
-       var history = [];  // List of messages sorted by Time
+       var hist = [];  // List of messages sorted by Time
        // Messages have these fields:
        //   Time: The timestamp.  Median of ServerTimes
        //   ID: Some unique string for deduping
        // Messages have these fields:
        //   Time: The timestamp.  Median of ServerTimes
        //   ID: Some unique string for deduping
        function rcaddmessagetohistory(message) {
                var message_i;
                if (message.Time) {
        function rcaddmessagetohistory(message) {
                var message_i;
                if (message.Time) {
-                       for (var i = history.length - 1; ; i--) {
-                               if (i < 0 || (history[i].Time && message.Time >= history[i].Time)) {
+                       for (var i = hist.length - 1; ; i--) {
+                               if (i < 0 || (hist[i].Time && message.Time >= hist[i].Time)) {
                                        message_i = i+1;
                                        message_i = i+1;
-                                       history.splice(message_i, 0, message);
+                                       hist.splice(message_i, 0, message);
                                        break;
                                }
                        }
                } else {
                                        break;
                                }
                        }
                } else {
-                       history.push(message);
-                       message_i = history.length-1;
+                       hist.push(message);
+                       message_i = hist.length-1;
                }
                }
-               if (message_i + 1 < history.length) {
-                       rcaddmessagetoUI(message, history[message_i + 1].UI);
+               if (message_i + 1 < hist.length) {
+                       rcaddmessagetoUI(message, hist[message_i + 1].UI);
                } else {
                        rcaddmessagetoUI(message, null);
                }
                } else {
                        rcaddmessagetoUI(message, null);
                }
                        message.Time = new Date(times[middle-1].getTime() + difference/2);
                }
 
                        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);
+               // This may have broken hist's in-sorted-order invariant
+               var hi = hist.indexOf(message);
+               if ((hist[hi-1] && hist[hi-1].Time > message.Time) ||
+                   (hist[hi+1] && hist[hi+1].Time < message.Time)) {
+                       hist.splice(hi,1);
                        rcaddmessagetohistory(message);
                }
 
                        rcaddmessagetohistory(message);
                }