Fix another bug with sound play with JSON deltas they are applied in-place).

[remoteglot] / www / js / remoteglot.js

diff --git a/www/js/remoteglot.js b/www/js/remoteglot.js
index 8dbeccbbd9e6ad329e6b754477d379fe162e0061..43b2e1ddbb7c304b2450349fbaef79e23e355d92 100644 (file)
--- a/www/js/remoteglot.js
+++ b/www/js/remoteglot.js
@@ -137,12 +137,15 @@ var request_update = function() {
                sync_server_clock(xhr.getResponseHeader('Date'));
                ims = xhr.getResponseHeader('X-RGLM');
                var num_viewers = xhr.getResponseHeader('X-RGNV');
-               possibly_play_sound(current_analysis_data, data);
+               var new_data;
                if (Array.isArray(data)) {
-                       current_analysis_data = JSON_delta.patch(current_analysis_data, data);
+                       new_data = JSON.parse(JSON.stringify(current_analysis_data));
+                       JSON_delta.patch(new_data, data);
                } else {
-                       current_analysis_data = data;
+                       new_data = data;
                }
+               possibly_play_sound(current_analysis_data, new_data);
+               current_analysis_data = new_data;
                update_board(current_analysis_data, displayed_analysis_data);
                update_num_viewers(num_viewers);
 
@@ -894,15 +897,16 @@ var update_clock = function() {
                }
        }
 
-       var white_clock = "";
-       var black_clock = "";
+       var white_clock_ms = null;
+       var black_clock_ms = null;
+       var show_seconds = false;
 
        // Static clocks.
        if (data['position'] &&
            data['position']['white_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]$/, "");
+               white_clock_ms = data['position']['white_clock'] * 1000;
+               black_clock_ms = data['position']['black_clock'] * 1000;
        }
 
        // Dynamic clock (only one, obviously).
@@ -919,30 +923,52 @@ var update_clock = function() {
                $("#whiteclock").removeClass("running-clock");
                $("#blackclock").removeClass("running-clock");
        }
+       var remaining_ms;
        if (color) {
                var now = new Date().getTime() + client_clock_offset_ms;
-               var remaining_ms = data['position'][color + '_clock_target'] * 1000 - now;
+               remaining_ms = data['position'][color + '_clock_target'] * 1000 - now;
                if (color === "white") {
-                       white_clock = format_clock(remaining_ms);
+                       white_clock_ms = remaining_ms;
                } else {
-                       black_clock = format_clock(remaining_ms);
+                       black_clock_ms = remaining_ms;
                }
+       }
+
+       if (white_clock_ms === null || black_clock_ms === null) {
+               $("#whiteclock").empty();
+               $("#blackclock").empty();
+               return;
+       }
 
+       // If either player has ten minutes or less left, add the second counters.
+       var show_seconds = (white_clock_ms < 60 * 10 * 1000 || black_clock_ms < 60 * 10 * 1000);
+
+       if (color) {
                // See when the clock will change next, and update right after that.
-               var next_update_ms = remaining_ms % 60000 + 100;
+               var next_update_ms;
+               if (show_seconds) {
+                       next_update_ms = remaining_ms % 1000 + 100;
+               } else {
+                       next_update_ms = remaining_ms % 60000 + 100;
+               }
                clock_timer = setTimeout(update_clock, next_update_ms);
        }
 
-       $("#whiteclock").text(white_clock);
-       $("#blackclock").text(black_clock);
+       $("#whiteclock").text(format_clock(white_clock_ms, show_seconds));
+       $("#blackclock").text(format_clock(black_clock_ms, show_seconds));
 }
 
 /**
  * @param {Number} remaining_ms
+ * @param {boolean} show_seconds
  */
-var format_clock = function(remaining_ms) {
+var format_clock = function(remaining_ms, show_seconds) {
        if (remaining_ms <= 0) {
-               return "00:00";
+               if (show_seconds) {
+                       return "00:00:00";
+               } else {
+                       return "00:00";
+               }
        }
 
        var remaining = Math.floor(remaining_ms / 1000);
@@ -951,7 +977,11 @@ var format_clock = function(remaining_ms) {
        var minutes = remaining % 60;
        remaining = (remaining - minutes) / 60;
        var hours = remaining;
-       return format_2d(hours) + ":" + format_2d(minutes);
+       if (show_seconds) {
+               return format_2d(hours) + ":" + format_2d(minutes) + ":" + format_2d(seconds);
+       } else {
+               return format_2d(hours) + ":" + format_2d(minutes);
+       }
 }
 
 /**
@@ -1072,6 +1102,41 @@ var update_historic_analysis = function() {
        });
 }
 
+/**
+ * @param {string} fen
+ */
+var update_imbalance = function(fen) {
+       var hiddenboard = new Chess(fen);
+       var imbalance = {'k': 0, 'q': 0, 'r': 0, 'b': 0, 'n': 0, 'p': 0};
+       for (var row = 0; row < 8; ++row) {
+               for (var col = 0; col < 8; ++col) {
+                       var col_text = String.fromCharCode('a1'.charCodeAt(0) + col);
+                       var row_text = String.fromCharCode('a1'.charCodeAt(1) + row);
+                       var square = col_text + row_text;
+                       var contents = hiddenboard.get(square);
+                       if (contents !== null) {
+                               if (contents.color === 'w') {
+                                       ++imbalance[contents.type];
+                               } else {
+                                       --imbalance[contents.type];
+                               }
+                       }
+               }
+       }
+       var white_imbalance = '';
+       var black_imbalance = '';
+       for (var piece in imbalance) {
+               for (var i = 0; i < imbalance[piece]; ++i) {
+                       white_imbalance += '<img src="img/chesspieces/wikipedia/w' + piece.toUpperCase() + '.png" alt="" style="width: 15px;height: 15px;">';
+               }
+               for (var i = 0; i < -imbalance[piece]; ++i) {
+                       black_imbalance += '<img src="img/chesspieces/wikipedia/b' + piece.toUpperCase() + '.png" alt="" style="width: 15px;height: 15px;">';
+               }
+       }
+       $('#whiteimbalance').html(white_imbalance);
+       $('#blackimbalance').html(black_imbalance);
+}
+
 var update_displayed_line = function() {
        if (highlighted_move !== null) {
                highlighted_move.removeClass('highlight'); 
@@ -1080,6 +1145,7 @@ var update_displayed_line = function() {
                $("#linenav").hide();
                $("#linemsg").show();
                board.position(fen);
+               update_imbalance(fen);
                return;
        }
 
@@ -1102,6 +1168,7 @@ var update_displayed_line = function() {
 
        var hiddenboard = chess_from(current_display_line.start_fen, current_display_line.pretty_pv, current_display_move);
        board.position(hiddenboard.fen());
+       update_imbalance(hiddenboard.fen());
 }
 
 /**