Various fixes related to history and showing moves. Also highlight the shown one.

diff --git a/www/css/remoteglot.css b/www/css/remoteglot.css
index b0aadab79dffc7c6e39ab948216d252b42e50ad2..ca956822dd69d01ad593df07fa02e5b5d274955e 100644 (file)
--- a/www/css/remoteglot.css
+++ b/www/css/remoteglot.css
@@ -120,6 +120,10 @@ a.move {
        color: black;
        text-decoration: none;
 }
        color: black;
        text-decoration: none;
 }

+a.move.highlight {
+       color: red;
+       font-weight: bold;
+}

 a.move:hover {
        font-weight: bold;
        text-decoration: underline;
 a.move:hover {
        font-weight: bold;
        text-decoration: underline;

diff --git a/www/index.html b/www/index.html
index 5468d603471292da8f0b9934159a6c56266bc017..03ebcbdb9e856adbc8d0f47d80cd9129f210240e 100644 (file)
--- a/www/index.html
+++ b/www/index.html
@@ -26,7 +26,7 @@
     |
     <span id="history">No history</span>
     |
     |
     <span id="history">No history</span>
     |

-    <span id="linemsg">Click on any move to show it.</span>
+    <span id="linemsg">Click on any move to show it on the board.</span>

     <span id="linenav">
       <span id="prevmove"><a href="javascript:prev_move();">Previous</a></span>,
       <span id="nextmove"><a href="javascript:next_move();">Next</a></span>,
     <span id="linenav">
       <span id="prevmove"><a href="javascript:prev_move();">Previous</a></span>,
       <span id="nextmove"><a href="javascript:next_move();">Next</a></span>,

diff --git a/www/js/remoteglot.js b/www/js/remoteglot.js
index 3189396c170526376c67492f4d380b0506a8a6f8..b42aa8e4ce0eb139e18ff95be8d28dd5d58b9aa1 100644 (file)
--- a/www/js/remoteglot.js
+++ b/www/js/remoteglot.js
@@ -45,6 +45,9 @@ var highlight_from = undefined;
 /** @type {!string|undefined} @private */
 var highlight_to = undefined;
 
 /** @type {!string|undefined} @private */
 var highlight_to = undefined;
 

+/** @type {?jQuery} @private */
+var highlighted_move = null;
+

 /** @type {!number} @private */
 var unique = Math.random();
 
 /** @type {!number} @private */
 var unique = Math.random();
 


@@ -57,7 +60,8 @@ var fen = null;
 /** @typedef {{
  *    start_fen: string,
  *    uci_pv: Array.<string>,
 /** @typedef {{
  *    start_fen: string,
  *    uci_pv: Array.<string>,

- *    pretty_pv: Array.<string>
+ *    pretty_pv: Array.<string>,
+ *    line_num: number

  * }} DisplayLine
  */
 
  * }} DisplayLine
  */
 


@@ -386,7 +390,8 @@ var add_pv = function(fen, uci_pv, pretty_pv, move_num, toplay, opt_limit, opt_s
        display_lines.push({
                start_fen: fen,
                uci_pv: uci_pv,
        display_lines.push({
                start_fen: fen,
                uci_pv: uci_pv,

-               pretty_pv: pretty_pv 
+               pretty_pv: pretty_pv,
+               line_number: display_lines.length

        });
        return print_pv(display_lines.length - 1, pretty_pv, move_num, toplay, opt_limit, opt_showlast);
 }
        });
        return print_pv(display_lines.length - 1, pretty_pv, move_num, toplay, opt_limit, opt_showlast);
 }


@@ -414,14 +419,14 @@ var print_pv = function(line_num, pretty_pv, move_num, toplay, opt_limit, opt_sh
                }
                move_num += i / 2;
        } else if (toplay == 'B') {
                }
                move_num += i / 2;
        } else if (toplay == 'B') {

-               var move = "<a class=\"move\" href=\"javascript:show_line(" + line_num + ", " + 0 + ");\">" + pretty_pv[0] + "</a>";
+               var move = "<a class=\"move\" id=\"automove" + line_num + "-0\" href=\"javascript:show_line(" + line_num + ", " + 0 + ");\">" + pretty_pv[0] + "</a>";

                pv = move_num + '. … ' + move;
                toplay = 'W';
                ++i;
                ++move_num;
        }
        for ( ; i < pretty_pv.length; ++i) {
                pv = move_num + '. … ' + move;
                toplay = 'W';
                ++i;
                ++move_num;
        }
        for ( ; i < pretty_pv.length; ++i) {

-               var move = "<a class=\"move\" href=\"javascript:show_line(" + line_num + ", " + i + ");\">" + pretty_pv[i] + "</a>";
+               var move = "<a class=\"move\" id=\"automove" + line_num + "-" + i + "\" href=\"javascript:show_line(" + line_num + ", " + i + ");\">" + pretty_pv[i] + "</a>";

 
                if (toplay == 'W') {
                        if (i > opt_limit && !opt_showlast) {
 
                if (toplay == 'W') {
                        if (i > opt_limit && !opt_showlast) {


@@ -474,8 +479,8 @@ var update_refutation_lines = function() {
        if (fen === null) {
                return;
        }
        if (fen === null) {
                return;
        }

-       if (display_lines.length > 1) {
-               display_lines = [ display_lines[0] ];
+       if (display_lines.length > 2) {
+               display_lines = [ display_lines[0], display_lines[1] ];

        }
 
        var tbl = $("#refutationlines");
        }
 
        var tbl = $("#refutationlines");


@@ -608,7 +613,7 @@ var update_board = function(data, num_viewers) {
        if (data['position']['history']) {
                add_pv('start', data['position']['history'], data['position']['pretty_history'], 1, 'W', 8, true);
        } else {
        if (data['position']['history']) {
                add_pv('start', data['position']['history'], data['position']['pretty_history'], 1, 'W', 8, true);
        } else {

-               displayed_lines.push(null);
+               display_lines.push(null);

        }
        update_history();
 
        }
        update_history();
 


@@ -731,6 +736,9 @@ var next_move = function() {
 window['next_move'] = next_move;
 
 var update_displayed_line = function() {
 window['next_move'] = next_move;
 
 var update_displayed_line = function() {

+       if (highlighted_move !== null) {
+               highlighted_move.removeClass('highlight'); 
+       }

        if (current_display_line === null) {
                $("#linenav").hide();
                $("#linemsg").show();
        if (current_display_line === null) {
                $("#linenav").hide();
                $("#linemsg").show();


@@ -770,6 +778,10 @@ var update_displayed_line = function() {
                        hiddenboard.move("a8-d8", false);
                }
        }
                        hiddenboard.move("a8-d8", false);
                }
        }

+
+       highlighted_move = $("#automove" + current_display_line.line_number + "-" + current_display_move);
+       highlighted_move.addClass('highlight'); 
+

        board.position(hiddenboard.position());
 }
 
        board.position(hiddenboard.position());
 }