]> git.sesse.net Git - remoteglot/blobdiff - www/js/remoteglot.js
Fix behavior of displayed score when we are in a sub-line and go back before the...
[remoteglot] / www / js / remoteglot.js
index b6076f4006e9d87034d553c6e7556031802fcff7..96acdd514aae54f5f49e8be636311a2ab428481d 100644 (file)
@@ -7,7 +7,7 @@
  * @type {Number}
  * @const
  * @private */
-var SCRIPT_VERSION = 2016032200;
+var SCRIPT_VERSION = 2016032201;
 
 /**
  * The current backend URL.
@@ -48,7 +48,8 @@ var displayed_analysis_data = null;
  *      name: string,
  *      url: string,
  *      id: string,
- *      score: Object
+ *      score: =Object,
+ *      result: =string,
  * }>}
  * @private
  */
@@ -159,7 +160,7 @@ var display_fen = null;
  *    pretty_pv: Array.<string>,
  *    move_num: number,
  *    toplay: string,
- *    score: string,
+ *    scores: Array<{first_move: number, score: Object}>,
  *    start_display_move_num: number
  * }} DisplayLine
  *
@@ -626,18 +627,18 @@ var thousands = function(x) {
  * @param {Array.<string>} pretty_pv
  * @param {number} move_num
  * @param {!string} toplay
- * @param {!string} score
+ * @param {Array<{ first_move: integer, score: Object }>} scores
  * @param {number} start_display_move_num
  * @param {number=} opt_limit
  * @param {boolean=} opt_showlast
  */
-var add_pv = function(start_fen, pretty_pv, move_num, toplay, score, start_display_move_num, opt_limit, opt_showlast) {
+var add_pv = function(start_fen, pretty_pv, move_num, toplay, scores, start_display_move_num, opt_limit, opt_showlast) {
        display_lines.push({
                start_fen: start_fen,
                pretty_pv: pretty_pv,
                move_num: parseInt(move_num),
                toplay: toplay,
-               score: score,
+               scores: scores,
                start_display_move_num: start_display_move_num
        });
        return print_pv(display_lines.length - 1, opt_limit, opt_showlast);
@@ -762,9 +763,11 @@ var update_refutation_lines = function() {
 
        // Find out where the lines start from.
        var base_line = [];
+       var base_scores = [];
        var start_display_move_num = 0;
        if (hash_refutation_lines) {
                base_line = current_display_line.pretty_pv.slice(0, current_display_move + 1);
+               base_scores = current_display_line.scores;
                start_display_move_num = base_line.length;
        }
 
@@ -788,6 +791,8 @@ var update_refutation_lines = function() {
                tr.appendChild(move_td);
                $(move_td).addClass("move");
 
+               var scores = base_scores.concat([{ first_move: start_display_move_num, score: line['score'] }]);
+
                if (line['pv_pretty'].length == 0) {
                        // Not found, so just make a one-move PV.
                        var move = "<a class=\"move\" href=\"javascript:show_line(" + display_lines.length + ", " + 0 + ");\">" + line['pretty_move'] + "</a>";
@@ -806,7 +811,7 @@ var update_refutation_lines = function() {
                        var pv_td = document.createElement("td");
                        tr.appendChild(pv_td);
                        $(pv_td).addClass("pv");
-                       $(pv_td).html(add_pv(base_fen, base_line.concat([ line['pretty_move'] ]), move_num, toplay, line['score'], start_display_move_num));
+                       $(pv_td).html(add_pv(base_fen, base_line.concat([ line['pretty_move'] ]), move_num, toplay, scores, start_display_move_num));
 
                        tbl.append(tr);
                        continue;
@@ -832,7 +837,7 @@ var update_refutation_lines = function() {
                var pv_td = document.createElement("td");
                tr.appendChild(pv_td);
                $(pv_td).addClass("pv");
-               $(pv_td).html(add_pv(base_fen, base_line.concat(line['pv_pretty']), move_num, toplay, line['score'], start_display_move_num, 10));
+               $(pv_td).html(add_pv(base_fen, base_line.concat(line['pv_pretty']), move_num, toplay, scores, start_display_move_num, 10));
 
                tbl.append(tr);
        }
@@ -889,16 +894,31 @@ var update_game_list = function(games) {
 
                var game_name = document.createTextNode(game['name']);
                if (game['url'] === backend_url) {
+                       // This game.
                        game_span.appendChild(game_name);
+
+                       var score;
+                       if (current_analysis_data['position']['result']) {
+                               score = " (" + current_analysis_data['position']['result'] + ")";
+                       } else {
+                               score = " (" + format_short_score(current_analysis_data['score']) + ")";
+                       }
+                       game_span.appendChild(document.createTextNode(score));
                } else {
+                       // Some other game.
                        var game_a = document.createElement("a");
                        game_a.setAttribute("href", "#" + game['id']);
                        game_a.appendChild(game_name);
                        game_span.appendChild(game_a);
-               }
 
-               var score = " (" + format_short_score(game['score']) + ")";
-               game_span.appendChild(document.createTextNode(score));
+                       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);
        }
@@ -946,11 +966,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.
@@ -1028,8 +1047,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);
@@ -1078,9 +1099,16 @@ var update_board = function() {
        update_clock();
 
        // The score.
-       if (current_display_line) {
-               if (current_display_line.score) {
-                       $("#score").text(format_long_score(current_display_line.score));
+       if (current_display_line && !current_display_line_is_history) {
+               if (current_display_line.scores && current_display_line.scores.length > 0) {
+                       var score;
+                       for (var i = 0; i < current_display_line.scores.length; ++i) {
+                               if (current_display_move < current_display_line.scores[i].first_move) {
+                                       break;
+                               }
+                               score = current_display_line.scores[i].score;
+                       }
+                       $("#score").text(format_long_score(score));
                } else {
                        $("#score").text("No score for this move");
                }
@@ -1117,7 +1145,9 @@ var update_board = function() {
 
        // Print the PV.
        $("#pvtitle").text("PV:");
-       $("#pv").html(add_pv(data['position']['fen'], data['pv_pretty'], data['position']['move_num'], data['position']['toplay'], data['score'], 0));
+
+       var scores = [{ first_move: 0, score: data['score'] }];
+       $("#pv").html(add_pv(data['position']['fen'], data['pv_pretty'], data['position']['move_num'], data['position']['toplay'], scores, 0));
 
        // Update the PV arrow.
        clear_arrows();
@@ -1511,6 +1541,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;
@@ -1905,14 +1953,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";
@@ -1930,9 +1970,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";
@@ -1940,7 +1980,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;
@@ -2085,10 +2125,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);