Fix history display with dropped pieces.

[remoteglot-book] / www / js / book.js

diff --git a/www/js/book.js b/www/js/book.js
index d95b6e8acdd6e3f1040b76d78ac80b05ed55c274..611678f8f99c52a3e73ea53241e31b88766dd24c 100644 (file)
--- a/www/js/book.js
+++ b/www/js/book.js
@@ -27,6 +27,20 @@ var get_game = function() {
 }
 
 var update = function() {
+       var text = "";
+       for (var i = 0; i < history.length; ++i) {
+               if (i % 2 == 0) {
+                       text += (i/2 + 1) + ". ";
+               }
+               if (i == move_override) {
+                       text += '<strong>' + history[i] + '</strong>';
+               } else {
+                       text += history[i];
+               }
+               text += " ";
+       }
+       $('#gamehistory').html(text);
+
        var game = get_game();
        board.position(game.fen());
        fetch_analysis();
@@ -97,9 +111,11 @@ var show_lines = function(data, game) {
        var total_num = 0;
        for (var i = 0; i < moves.length; ++i) {
                var move = moves[i];
-               total_num += parseInt(move['white']);
-               total_num += parseInt(move['draw']);
-               total_num += parseInt(move['black']);
+               if (move['move']) {
+                       total_num += parseInt(move['white']);
+                       total_num += parseInt(move['draw']);
+                       total_num += parseInt(move['black']);
+               }
        }
 
        var headings_tr = $("#headings");
@@ -177,7 +193,7 @@ var show_lines = function(data, game) {
                var line = lines[i];
                var tr = document.createElement("tr");
 
-               if (line[0] === undefined || line[0] === null) {
+               if (line[0] === undefined) {
                        $(tr).addClass("totals");
                }
 
@@ -188,6 +204,14 @@ var show_lines = function(data, game) {
                                var td = document.createElement("td");
                                tr.appendChild(td);
                                $(td).addClass("move");
+                               if (line[j] !== undefined) {
+                                       if (move_override % 2 == 0) {
+                                               $(td).text(((move_override / 2) + 1) + ". ");
+                                       } else {
+                                               $(td).text(((move_override / 2) + 0.5) + ". …");
+                                       }
+                               }
+
                                var move_a = document.createElement("a");
                                move_a.href = "javascript:make_move('" + line[j] + "')";
                                td.appendChild(move_a);
@@ -206,9 +230,14 @@ var show_lines = function(data, game) {
 }
 
 var make_move = function(move) {
-       history.length = move_override;
-       history.push(move);
-       move_override = history.length;
+       if (move_override < history.length && history[move_override] == move) {
+               // User effectively only moved forward in history.
+               ++move_override;
+       } else {
+               history.length = move_override;
+               history.push(move);
+               move_override = history.length;
+       }
        update();
 }
 window['make_move'] = make_move;
@@ -251,8 +280,13 @@ var onDrop = function(source, target) {
        // illegal move
        if (move === null) return 'snapback';
 
-       history = game.history({ verbose: true });
+       var new_history = game.history({ verbose: true });
+       history = [];
+       for (var i = 0; i < new_history.length; ++i) {
+               history.push(new_history[i].san);
+       }
        move_override = history.length;
+       update();
 };
 
 // update the board position after the piece snap