Fix some transposition handling, and add a checkbox to not include them anymore.

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

diff --git a/www/js/book.js b/www/js/book.js
index a489a6a3ed3c1a1dc0ef199789b870274ee42032..6017fd9d0d5eb6a91a1238089c080a7af460c819 100644 (file)
--- a/www/js/book.js
+++ b/www/js/book.js
@@ -3,6 +3,7 @@
 var board = null;
 var history = [];
 var move_override = 0;
+var includetransp = true;
 
 var entity_map = {
        "&": "&",
@@ -18,24 +19,61 @@ function escape_html(string) {
        });
 }
 
-var get_game = function() {
+var get_game = function(skip_last_move) {
+       var moves_to_drop = 0;
+       if (skip_last_move === true) {
+               moves_to_drop = 1;
+       }
+
        var game = new Chess();
-       for (var i = 0; i < move_override; ++i) {
+       for (var i = 0; i < move_override - moves_to_drop; ++i) {
                game.move(history[i]);
        }
        return game;
 }
 
 var update = function() {
+       var text = "";
+       for (var i = 0; i < history.length; ++i) {
+               if (i % 2 == 0) {
+                       text += (i/2 + 1) + ". ";
+               }
+               if (i + 1 == move_override) {
+                       text += '<strong>' + history[i] + '</strong>';
+               } else {
+                       text += '<a href="javascript:set_move(' + (i + 1) + ')">' + history[i] + '</a>';
+               }
+               text += " ";
+       }
+       $('#gamehistory').html(text);
+
        var game = get_game();
        board.position(game.fen());
+
+       var all_moves = game.history({ verbose: true });
+       if (all_moves.length > 0) {
+               var last_move = all_moves.pop();
+               var highlight_from = last_move.from;
+               var highlight_to = last_move.to;
+               $("#board").find('.square-55d63').removeClass('nonuglyhighlight');
+               $("#board").find('.square-' + highlight_from).addClass('nonuglyhighlight');
+               $("#board").find('.square-' + highlight_to).addClass('nonuglyhighlight');
+       }
+
        fetch_analysis();
 }
 
 var fetch_analysis = function() {
        var game = get_game();
+       var fen = game.fen();
+       var prevfen = "";
+       if (move_override > 0) {
+               prevfen = get_game(true).fen();
+       }
        $.ajax({
-               url: "/opening-stats.pl?fen=" + encodeURIComponent(game.fen())
+               url: "/opening-stats.pl?fen=" + encodeURIComponent(fen) +
+                       ";prevfen=" + encodeURIComponent(prevfen) +
+                       ";includetransp=" + (includetransp ? 1 : 0)
        }).done(function(data, textstatus, xhr) {
                show_lines(data, game);
        });
@@ -97,9 +135,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 +217,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");
                }
 
@@ -189,10 +229,10 @@ var show_lines = function(data, game) {
                                tr.appendChild(td);
                                $(td).addClass("move");
                                if (line[j] !== undefined) {
-                                       if (history.length % 2 == 0) {
-                                               $(td).text(((history.length / 2) + 1) + ". ");
+                                       if (move_override % 2 == 0) {
+                                               $(td).text(((move_override / 2) + 1) + ". ");
                                        } else {
-                                               $(td).text(((history.length / 2) + 0.5) + ". …");
+                                               $(td).text(((move_override / 2) + 0.5) + "…");
                                        }
                                }
 
@@ -213,10 +253,21 @@ var show_lines = function(data, game) {
        }
 }
 
+var set_includetransp = function(value) {
+       includetransp = value;
+       update();
+}
+window['set_includetransp'] = set_includetransp;
+
 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;
@@ -237,6 +288,12 @@ var next_move = function() {
 }
 window['next_move'] = next_move;
 
+var set_move = function(n) {
+       move_override = n;
+       update();
+}
+window['set_move'] = set_move;
+
 // almost all of this stuff comes from the chessboard.js example page
 var onDragStart = function(source, piece, position, orientation) {
        var game = get_game();
@@ -259,7 +316,11 @@ 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;
 };
 
@@ -268,7 +329,7 @@ var onDrop = function(source, target) {
 var onSnapEnd = function() {
        var game = get_game();
        board.position(game.fen());
-       fetch_analysis();
+       update();
 };
 
 var init = function() {