X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=www%2Fjs%2Fremoteglot.js;h=96acdd514aae54f5f49e8be636311a2ab428481d;hb=c5aaad04e6ca85bced278aa9d75e741f2e9e1467;hp=0a4366cbf801180b79ab5eef25a1c515bca784fd;hpb=fbc73d17f36578f7eb877322ea63a6b488868c69;p=remoteglot diff --git a/www/js/remoteglot.js b/www/js/remoteglot.js index 0a4366c..96acdd5 100644 --- a/www/js/remoteglot.js +++ b/www/js/remoteglot.js @@ -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., * 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.} 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 = "" + line['pretty_move'] + ""; @@ -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 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; @@ -2077,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);