Fix display of castling (Chess.js does not like 0-0 and 0-0-0, but wants O-O and...

[remoteglot] / www / js / remoteglot.js

diff --git a/www/js/remoteglot.js b/www/js/remoteglot.js
index 01fee378b933b417a8669a9bf8b5a74e8c4d0009..8dbeccbbd9e6ad329e6b754477d379fe162e0061 100644 (file)
--- a/www/js/remoteglot.js
+++ b/www/js/remoteglot.js
@@ -135,10 +135,14 @@ var request_update = function() {
                url: "/analysis.pl?ims=" + ims + "&unique=" + unique
        }).done(function(data, textstatus, xhr) {
                sync_server_clock(xhr.getResponseHeader('Date'));
-               ims = xhr.getResponseHeader('X-Remoteglot-Last-Modified');
-               var num_viewers = xhr.getResponseHeader('X-Remoteglot-Num-Viewers');
+               ims = xhr.getResponseHeader('X-RGLM');
+               var num_viewers = xhr.getResponseHeader('X-RGNV');
                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);
 
@@ -629,6 +633,28 @@ var update_refutation_lines = function() {
        }
 }
 
+/**
+ * @param {?string} fen
+ * @param {Array.<string>} moves
+ * @param {number} last_move
+ */
+var chess_from = function(fen, moves, last_move) {
+       var hiddenboard = new Chess();
+       if (fen !== null) {
+               hiddenboard.load(fen);
+       }
+       for (var i = 0; i <= last_move; ++i) {
+               if (moves[i] === '0-0') {
+                       hiddenboard.move('O-O');
+               } else if (moves[i] === '0-0-0') {
+                       hiddenboard.move('O-O-O');
+               } else {
+                       hiddenboard.move(moves[i]);
+               }
+       }
+       return hiddenboard;
+}
+
 /**
  * @param {Object} data
  * @param {?Object} display_data
@@ -702,10 +728,7 @@ var update_board = function(current_data, display_data) {
                // We don't have historic analysis for this position, but we
                // can reconstruct what the last move was by just replaying
                // from the start.
-               var hiddenboard = new Chess();
-               for (var i = 0; i <= current_display_move; ++i) {
-                       hiddenboard.move(current_display_line.pretty_pv[i]);
-               }
+               var hiddenboard = chess_from(null, current_display_line.pretty_pv, current_display_move);
                var moves = hiddenboard.history({ verbose: true });
                var last_move = moves.pop();
                highlight_from = last_move.from;
@@ -851,16 +874,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 +901,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 +929,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 +942,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 +951,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);
 }
 
 /**
@@ -1021,10 +1057,7 @@ var update_historic_analysis = function() {
        }
 
        // Fetch old analysis for this line if it exists.
-       var hiddenboard = new Chess();
-       for (var i = 0; i <= current_display_move; ++i) {
-               hiddenboard.move(current_display_line.pretty_pv[i]);
-       }
+       var hiddenboard = chess_from(null, current_display_line.pretty_pv, current_display_move);
        var filename = "/history/move" + (current_display_move + 1) + "-" +
                hiddenboard.fen().replace(/ /g, '_').replace(/\//g, '-') + ".json";
 
@@ -1064,15 +1097,10 @@ var update_displayed_line = function() {
                $("#nextmove").html("<a href=\"javascript:next_move();\">Next</a></span>");
        }
 
-       var hiddenboard = new Chess();
-       hiddenboard.load(current_display_line.start_fen);
-       for (var i = 0; i <= current_display_move; ++i) {
-               hiddenboard.move(current_display_line.pretty_pv[i]);
-       }
-
        highlighted_move = $("#automove" + current_display_line.line_number + "-" + current_display_move);
        highlighted_move.addClass('highlight'); 
 
+       var hiddenboard = chess_from(current_display_line.start_fen, current_display_line.pretty_pv, current_display_move);
        board.position(hiddenboard.fen());
 }