Only truncate history if needed.

[remoteglot] / www / js / remoteglot.js

diff --git a/www/js/remoteglot.js b/www/js/remoteglot.js
index b42aa8e4ce0eb139e18ff95be8d28dd5d58b9aa1..595bce185aa1a3457dc89cb5241fe5abee9c307e 100644 (file)
--- a/www/js/remoteglot.js
+++ b/www/js/remoteglot.js
@@ -407,7 +407,7 @@ var add_pv = function(fen, uci_pv, pretty_pv, move_num, toplay, opt_limit, opt_s
 var print_pv = function(line_num, pretty_pv, move_num, toplay, opt_limit, opt_showlast) {
        var pv = '';
        var i = 0;
-       if (opt_limit && opt_showlast) {
+       if (opt_limit && opt_showlast && pretty_pv.length > opt_limit) {
                // Truncate the PV at the beginning (instead of at the end).
                // We assume here that toplay is 'W'. We also assume that if
                // opt_showlast is set, then it is the history, and thus,
@@ -455,7 +455,7 @@ var update_highlight = function() {
 }
 
 var update_history = function() {
-       if (display_lines[0] === null) {
+       if (display_lines[0] === null || display_lines[0].pretty_pv.length == 0) {
                $("#history").html("No history");
        } else if (truncate_display_history) {
                $("#history").html(print_pv(0, display_lines[0].pretty_pv, 1, 'W', 8, true));
@@ -603,7 +603,7 @@ var update_board = function(data, num_viewers) {
 
        if (data['position']['last_move_uci']) {
                highlight_from = data['position']['last_move_uci'].substr(0, 2);
-               highlight_to = data['position']['last_move_uci'].substr(2, 4);
+               highlight_to = data['position']['last_move_uci'].substr(2, 2);
        } else {
                highlight_from = highlight_to = undefined;
        }
@@ -627,7 +627,7 @@ var update_board = function(data, num_viewers) {
                for (var i = 0; i < data['pv_uci'].length; i += 2) {
                        var from = data['pv_uci'][i].substr(0, 2);
                        var to = data['pv_uci'][i].substr(2,4);
-                       if ((i >= 2 && from != data['pv_uci'][i - 2].substr(2, 4)) ||
+                       if ((i >= 2 && from != data['pv_uci'][i - 2].substr(2, 2)) ||
                             interfering_arrow(from, to)) {
                                break;
                        }
@@ -637,7 +637,7 @@ var update_board = function(data, num_viewers) {
                var alt_moves = find_nonstupid_moves(data, 30);
                for (var i = 1; i < alt_moves.length && i < 3; ++i) {
                        create_arrow(alt_moves[i].substr(0, 2),
-                                    alt_moves[i].substr(2, 4), '#f66', 1, 10);
+                                    alt_moves[i].substr(2, 2), '#f66', 1, 10);
                }
        }
 
@@ -668,7 +668,7 @@ var update_board = function(data, num_viewers) {
 
                if (nonstupid_moves.length > 0 && response !== undefined) {
                        create_arrow(response.substr(0, 2),
-                                    response.substr(2, 4), '#66f', 6, 20);
+                                    response.substr(2, 2), '#66f', 6, 20);
                }
        }
 
@@ -749,7 +749,7 @@ var update_displayed_line = function() {
        $("#linenav").show();
        $("#linemsg").hide();
 
-       if (current_display_move == 0) {
+       if (current_display_move <= 0) {
                $("#prevmove").html("Previous");
        } else {
                $("#prevmove").html("<a href=\"javascript:prev_move();\">Previous</a></span>");
@@ -762,9 +762,32 @@ var update_displayed_line = function() {
 
        hiddenboard.position(current_display_line.start_fen, false);
        for (var i = 0; i <= current_display_move; ++i) {
+               var pos = hiddenboard.position();
                var move = current_display_line.uci_pv[i];
-               move = move.substr(0, 2) + "-" + move.substr(2, 4);
+               var source = move.substr(0, 2);
+               var target = move.substr(2, 2);
+               var promo = move.substr(4, 1);
+
+               // Check if we need to do en passant.
+               var piece = pos[source];
+               if (piece == "wP" || piece == "bP") {
+                       if (source.substr(0, 1) != target.substr(0, 1) &&
+                           pos[target] === undefined) {
+                               var ep_square = target.substr(0, 1) + source.substr(1, 1);
+                               delete pos[ep_square];
+                               hiddenboard.position(pos, false);
+                       }
+               }
+
+               move = source + "-" + target;
                hiddenboard.move(move, false);
+               pos = hiddenboard.position();
+
+               // Do promotion if needed.
+               if (promo != "") {
+                       pos[target] = pos[target].substr(0, 1) + promo.toUpperCase();
+                       hiddenboard.position(pos, false);
+               }
 
                // chessboard.js does not automatically move the rook on castling
                // (issue #51; marked as won't fix), so update it ourselves.