Fix “no score for this move” message when viewing history.

[remoteglot] / www / js / remoteglot.js

diff --git a/www/js/remoteglot.js b/www/js/remoteglot.js
index 7ad1ff02565d904c2080e662a1ad7731b5a5f3e7..e3b3202d14183250bbb840be05803a4481e0d9f8 100644 (file)
--- a/www/js/remoteglot.js
+++ b/www/js/remoteglot.js
@@ -7,7 +7,7 @@
  * @type {Number}
  * @const
  * @private */
-var SCRIPT_VERSION = 2016032000;
+var SCRIPT_VERSION = 2016032201;
 
 /**
  * The current backend URL.
@@ -48,6 +48,8 @@ var displayed_analysis_data = null;
  *      name: string,
  *      url: string,
  *      id: string,
+ *      score: =Object,
+ *      result: =string,
  * }>}
  * @private
  */
@@ -644,8 +646,8 @@ var add_pv = function(start_fen, pretty_pv, move_num, toplay, score, start_displ
 
 /**
  * @param {number} line_num
- * @param {number=} opt_limit
- * @param {boolean=} opt_showlast
+ * @param {number=} opt_limit If set, show at most this number of moves.
+ * @param {boolean=} opt_showlast If limit is set, show the last moves instead of the first ones.
  */
 var print_pv = function(line_num, opt_limit, opt_showlast) {
        var display_line = display_lines[line_num];
@@ -731,7 +733,7 @@ var update_history = function() {
        } else {
                $("#history").html(
                        '(<a class="move" href="javascript:collapse_history(true)">collapse</a>) ' +
-                       print_pv(0, 1, 'W'));
+                       print_pv(0));
        }
 }
 
@@ -895,6 +897,15 @@ var update_game_list = function(games) {
                        game_a.appendChild(game_name);
                        game_span.appendChild(game_a);
                }
+
+               var score;
+               if (game['result']) {
+                       score = " (" + game['result'] + ")";
+               } else {
+                       score = " (" + format_short_score(game['score']) + ")";
+               }
+               game_span.appendChild(document.createTextNode(score));
+
                games_div.appendChild(game_span);
        }
 }
@@ -912,7 +923,7 @@ var possibly_switch_game_from_hash = function() {
        for (var i = 0; i < current_games.length; ++i) {
                if (current_games[i]['id'] === hash) {
                        if (backend_url !== current_games[i]['url']) {
-                               switch_backend(current_games[i]['url']);
+                               switch_backend(current_games[i]['url'], current_games[i]['hashurl']);
                        }
                        return;
                }
@@ -941,11 +952,10 @@ var update_board = function() {
        if (current_data['games']) {
                current_games = current_data['games'];
                possibly_switch_game_from_hash();
-               update_game_list(current_data['games']);
        } else {
                current_games = null;
-               update_game_list(null);
        }
+       update_game_list(current_games);
 
        // The headline. Names are always fetched from current_data;
        // the rest can depend a bit.
@@ -1023,8 +1033,10 @@ var update_board = function() {
 
        // The <title> contains a very brief headline.
        var title_elems = [];
-       if (data['score']) {
-               title_elems.push(format_short_score(data['score']).replace(/^ /, ""));
+       if (data['position'] && data['position']['result']) {
+               title_elems.push(data['position']['result']);
+       } else if (data['score']) {
+               title_elems.push(format_short_score(data['score']));
        }
        if (last_move !== null) {
                title_elems.push(last_move);
@@ -1073,7 +1085,7 @@ var update_board = function() {
        update_clock();
 
        // The score.
-       if (current_display_line) {
+       if (current_display_line && !current_display_line_is_history) {
                if (current_display_line.score) {
                        $("#score").text(format_long_score(current_display_line.score));
                } else {
@@ -1506,6 +1518,24 @@ var next_move = function() {
 }
 window['next_move'] = next_move;
 
+var next_game = function() {
+       if (current_games === null) {
+               return;
+       }
+
+       // Try to find the game we are currently looking at.
+       for (var game_num = 0; game_num < current_games.length; ++game_num) {
+               var game = current_games[game_num];
+               if (game['url'] === backend_url) {
+                       var next_game_num = (game_num + 1) % current_games.length;
+                       switch_backend(current_games[next_game_num]['url'], current_games[next_game_num]['hashurl']);
+                       return;
+               }
+       }
+
+       // Couldn't find it; give up.
+}
+
 var update_historic_analysis = function() {
        if (!current_display_line_is_history) {
                return;
@@ -1801,6 +1831,15 @@ var get_best_move = function(game, source, target, invert) {
                move_hash[moves[i].san] = moves[i];
        }
 
+       // See if we're already exploring some line.
+       if (current_display_line &&
+           current_display_move < current_display_line.pretty_pv.length - 1) {
+               var first_move = current_display_line.pretty_pv[current_display_move + 1];
+               if (move_hash[first_move]) {
+                       return move_hash[first_move];
+               }
+       }
+
        // History and PV take priority over the display lines.
        for (var i = 0; i < 2; ++i) {
                var line = display_lines[i];
@@ -1891,14 +1930,6 @@ var onSnapEnd = function(source, target) {
 }
 // End of dragging-related code.
 
-var pad = function(val, num_digits) {
-       var s = val.toString();
-       while (s.length < num_digits) {
-               s = " " + s;
-       }
-       return s;
-}
-
 var fmt_cp = function(v) {
        if (v === 0) {
                return "0.00";
@@ -1916,9 +1947,9 @@ var format_short_score = function(score) {
        }
        if (score[0] === 'm') {
                if (score[2]) {  // Is a bound.
-                       return score[2] + "\u00a0M" + pad(score[1], 3);
+                       return score[2] + "\u00a0M " + score[1];
                } else {
-                       return "M" + pad(score[1], 3);
+                       return "M " + score[1];
                }
        } else if (score[0] === 'd') {
                return "TB draw";
@@ -1926,7 +1957,7 @@ var format_short_score = function(score) {
                if (score[2]) {  // Is a bound.
                        return score[2] + "\u00a0" + fmt_cp(score[1]);
                } else {
-                       return pad(fmt_cp(score[1]), 5);
+                       return fmt_cp(score[1]);
                }
        }
        return null;
@@ -1999,7 +2030,7 @@ var compute_score_sort_key = function(score, invert) {
 /**
  * @param {string} new_backend_url
  */
-var switch_backend = function(new_backend_url) {
+var switch_backend = function(new_backend_url, new_backend_hash_url) {
        // Stop looking at historic data.
        current_display_line = null;
        current_display_move = null;
@@ -2029,6 +2060,7 @@ var switch_backend = function(new_backend_url) {
 
        // Request an immediate fetch with the new backend.
        backend_url = new_backend_url;
+       backend_hash_url = new_backend_hash_url;
        current_analysis_data = null;
        ims = 0;
        request_update();
@@ -2070,10 +2102,17 @@ var init = function() {
                redraw_arrows();
        });
        $(window).keyup(function(event) {
-               if (event.which == 39) {
+               if (event.which == 39) {  // Left arrow.
                        next_move();
-               } else if (event.which == 37) {
+               } else if (event.which == 37) {  // Right arrow.
                        prev_move();
+               } else if (event.which >= 49 && event.which <= 57) {  // 1-9.
+                       var num = event.which - 49;
+                       if (current_games && current_games.length >= num) {
+                               switch_backend(current_games[num]['url'], current_games[num]['hashurl']);
+                       }
+               } else if (event.which == 78) {  // N.
+                       next_game();
                }
        });
        window.addEventListener('hashchange', possibly_switch_game_from_hash, false);