Make sure we do not try to process more than one analysis.json update at a time.

[remoteglot] / www / js / remoteglot.js

diff --git a/www/js/remoteglot.js b/www/js/remoteglot.js
index 01fee378b933b417a8669a9bf8b5a74e8c4d0009..3c85e672e0a66b57bebc8e1a79b1b2f798dc9735 100644 (file)
--- a/www/js/remoteglot.js
+++ b/www/js/remoteglot.js
@@ -138,7 +138,11 @@ var request_update = function() {
                ims = xhr.getResponseHeader('X-Remoteglot-Last-Modified');
                var num_viewers = xhr.getResponseHeader('X-Remoteglot-Num-Viewers');
                possibly_play_sound(current_analysis_data, data);
-               current_analysis_data = data;
+               if (Array.isArray(data)) {
+                       current_analysis_data = JSON_delta.patch(current_analysis_data, data);
+               } else {
+                       current_analysis_data = data;
+               }
                update_board(current_analysis_data, displayed_analysis_data);
                update_num_viewers(num_viewers);
 
@@ -851,16 +855,22 @@ var update_clock = function() {
                if (result === '1-0') {
                        $("#whiteclock").text("1");
                        $("#blackclock").text("0");
+                       $("#whiteclock").removeClass("running-clock");
+                       $("#blackclock").removeClass("running-clock");
                        return;
                }
                if (result === '1/2-1/2') {
                        $("#whiteclock").text("1/2");
                        $("#blackclock").text("1/2");
+                       $("#whiteclock").removeClass("running-clock");
+                       $("#blackclock").removeClass("running-clock");
                        return;
                }       
                if (result === '0-1') {
                        $("#whiteclock").text("0");
                        $("#blackclock").text("1");
+                       $("#whiteclock").removeClass("running-clock");
+                       $("#blackclock").removeClass("running-clock");
                        return;
                }
        }
@@ -872,16 +882,23 @@ var update_clock = function() {
        if (data['position'] &&
            data['position']['white_clock'] &&
            data['position']['black_clock']) {
-               white_clock = data['position']['white_clock'];
-               black_clock = data['position']['black_clock'];
+               white_clock = data['position']['white_clock'].replace(/:[0-5][0-9]$/, "");
+               black_clock = data['position']['black_clock'].replace(/:[0-5][0-9]$/, "");
        }
 
        // Dynamic clock (only one, obviously).
        var color;
        if (data['position']['white_clock_target']) {
                color = "white";
+               $("#whiteclock").addClass("running-clock");
+               $("#blackclock").removeClass("running-clock");
        } else if (data['position']['black_clock_target']) {
                color = "black";
+               $("#whiteclock").removeClass("running-clock");
+               $("#blackclock").addClass("running-clock");
+       } else {
+               $("#whiteclock").removeClass("running-clock");
+               $("#blackclock").removeClass("running-clock");
        }
        if (color) {
                var now = new Date().getTime() + client_clock_offset_ms;
@@ -893,7 +910,7 @@ var update_clock = function() {
                }
 
                // See when the clock will change next, and update right after that.
-               var next_update_ms = remaining_ms % 1000 + 100;
+               var next_update_ms = remaining_ms % 60000 + 100;
                clock_timer = setTimeout(update_clock, next_update_ms);
        }
 
@@ -906,7 +923,7 @@ var update_clock = function() {
  */
 var format_clock = function(remaining_ms) {
        if (remaining_ms <= 0) {
-               return "00:00:00";
+               return "00:00";
        }
 
        var remaining = Math.floor(remaining_ms / 1000);
@@ -915,7 +932,7 @@ var format_clock = function(remaining_ms) {
        var minutes = remaining % 60;
        remaining = (remaining - minutes) / 60;
        var hours = remaining;
-       return format_2d(hours) + ":" + format_2d(minutes) + ":" + format_2d(seconds);  
+       return format_2d(hours) + ":" + format_2d(minutes);
 }
 
 /**