X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=www%2Fjs%2Fremoteglot.js;h=ff566ab85c81c4ba4b33ff8a9853bec23d8f89ca;hb=ace6e885e3ee17923c618e68d487e7631dc34553;hp=5cd1a97e1a1dbcf14c4ed1bc5fabe9e1cbff887e;hpb=1a04a89fab0e0f95ab4a5cde6e12729dc2bc93d6;p=remoteglot
diff --git a/www/js/remoteglot.js b/www/js/remoteglot.js
index 5cd1a97..ff566ab 100644
--- a/www/js/remoteglot.js
+++ b/www/js/remoteglot.js
@@ -7,7 +7,7 @@
* @type {Number}
* @const
* @private */
-var SCRIPT_VERSION = 2016032202;
+var SCRIPT_VERSION = 2016113002;
/**
* The current backend URL.
@@ -47,6 +47,7 @@ var displayed_analysis_data = null;
* @type {?Array.<{
* name: string,
* url: string,
+ * hashurl: string,
* id: string,
* score: Object=,
* result: string=,
@@ -93,9 +94,6 @@ var toplay = 'W';
/** @type {number} @private */
var ims = 0;
-/** @type {boolean} @private */
-var sort_refutation_lines_by_score = true;
-
/** @type {boolean} @private */
var truncate_display_history = true;
@@ -276,13 +274,31 @@ var request_update = function() {
location.reload(true);
}
- possibly_play_sound(current_analysis_data, new_data);
- current_analysis_data = new_data;
- update_board();
- update_num_viewers(num_viewers);
+ // Verify that the PV makes sense.
+ var valid = true;
+ if (new_data['pv']) {
+ var hiddenboard = new Chess(new_data['position']['fen']);
+ for (var i = 0; i < new_data['pv'].length; ++i) {
+ if (hiddenboard.move(new_data['pv'][i]) === null) {
+ valid = false;
+ break;
+ }
+ }
+ }
+
+ var timeout = 100;
+ if (valid) {
+ possibly_play_sound(current_analysis_data, new_data);
+ current_analysis_data = new_data;
+ update_board();
+ update_num_viewers(num_viewers);
+ } else {
+ console.log("Received invalid update, waiting five seconds and trying again.");
+ location.reload(true);
+ }
// Next update.
- current_analysis_request_timer = setTimeout(function() { request_update(); }, 100);
+ current_analysis_request_timer = setTimeout(function() { request_update(); }, timeout);
}).fail(function(jqXHR, textStatus, errorThrown) {
if (textStatus === "abort") {
// Aborted because we are switching backends. Abandon and don't retry,
@@ -550,15 +566,6 @@ var create_arrow = function(from_square, to_square, fg_color, line_width, arrow_
arrows.push(arrow);
}
-// Note: invert is ignored.
-var compare_by_name = function(refutation_lines, invert, a, b) {
- var ska = refutation_lines[a]['move'];
- var skb = refutation_lines[b]['move'];
- if (ska < skb) return -1;
- if (ska > skb) return 1;
- return 0;
-};
-
var compare_by_score = function(refutation_lines, invert, a, b) {
var sa = compute_score_sort_key(refutation_lines[b]['score'], refutation_lines[b]['depth'], invert);
var sb = compute_score_sort_key(refutation_lines[a]['score'], refutation_lines[a]['depth'], invert);
@@ -584,7 +591,7 @@ var find_nonstupid_moves = function(data, margin, invert) {
var pv_score = undefined;
for (var move in data['refutation_lines']) {
var line = data['refutation_lines'][move];
- var score = compute_score_sort_key(line['score'], line['depth'], invert);
+ var score = compute_score_sort_key(line['score'], line['depth'], invert, false);
if (move == data['pv'][0]) {
pv_score = score;
}
@@ -782,8 +789,7 @@ var update_refutation_lines = function() {
if (current_display_line && current_display_move % 2 == 0) {
invert = !invert;
}
- var compare = sort_refutation_lines_by_score ? compare_by_score : compare_by_name;
- moves = moves.sort(function(a, b) { return compare(refutation_lines, invert, a, b) });
+ moves = moves.sort(function(a, b) { return compare_by_score(refutation_lines, invert, a, b) });
for (var i = 0; i < moves.length; ++i) {
var line = refutation_lines[moves[i]];
@@ -844,15 +850,6 @@ var update_refutation_lines = function() {
tbl.append(tr);
}
- // Make one of the links clickable and the other nonclickable.
- if (sort_refutation_lines_by_score) {
- $("#sortbyscore0").html("Move");
- $("#sortbyscore1").html("Score");
- } else {
- $("#sortbyscore0").html("Move");
- $("#sortbyscore1").html("Score");
- }
-
// Update the move highlight, as we've rewritten all the HTML.
update_move_highlight();
}
@@ -867,7 +864,7 @@ var update_refutation_lines = function() {
*/
var chess_from = function(fen, moves, last_move) {
var hiddenboard = new Chess();
- if (fen !== null) {
+ if (fen !== null && fen !== undefined) {
hiddenboard.load(fen);
}
for (var i = 0; i <= last_move; ++i) {
@@ -941,7 +938,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'], current_games[i]['hashurl']);
+ switch_backend(current_games[i]);
}
return;
}
@@ -960,7 +957,8 @@ var update_board = function() {
// unconditionally taken from current_data (we're not interested in
// historic history).
if (current_data['position']['history']) {
- add_pv('start', current_data['position']['history'], 1, 'W', null, 0, 8, true);
+ var start = (current_data['position'] && current_data['position']['start_fen']) ? current_data['position']['start_fen'] : 'start';
+ add_pv(start, current_data['position']['history'], 1, 'W', null, 0, 8, true);
} else {
display_lines.push(null);
}
@@ -1034,15 +1032,27 @@ var update_board = function() {
if (displayed_analysis_data) {
// Displaying some non-current position, pick out the last move
// from the history. This will work even if the fetch failed.
- last_move = format_halfmove_with_number(
- current_display_line.pv[current_display_move],
- current_display_move + 1);
- headline += ' after ' + last_move;
+ if (current_display_move !== -1) {
+ last_move = format_halfmove_with_number(
+ current_display_line.pv[current_display_move],
+ current_display_move);
+ headline += ' after ' + last_move;
+ }
} else if (data['position']['last_move'] !== 'none') {
+ // Find the previous move.
+ var previous_move_num, previous_toplay;
+ if (data['position']['toplay'] == 'B') {
+ previous_move_num = data['position']['move_num'];
+ previous_toplay = 'W';
+ } else {
+ previous_move_num = data['position']['move_num'] - 1;
+ previous_toplay = 'B';
+ }
+
last_move = format_move_with_number(
data['position']['last_move'],
- data['position']['move_num'],
- data['position']['toplay'] == 'W');
+ previous_move_num,
+ previous_toplay == 'W');
headline += ' after ' + last_move;
} else {
last_move = null;
@@ -1070,11 +1080,12 @@ var update_board = function() {
if (data['position'] && data['position']['last_move_uci']) {
highlight_from = data['position']['last_move_uci'].substr(0, 2);
highlight_to = data['position']['last_move_uci'].substr(2, 2);
- } else if (current_display_line_is_history && current_display_move >= 0) {
+ } else if (current_display_line_is_history && current_display_line && current_display_move >= 0) {
// We don't have historic analysis for this position, but we
// can reconstruct what the last move was by just replaying
// from the start.
- var hiddenboard = chess_from(null, current_display_line.pv, current_display_move);
+ var position = (data['position'] && data['position']['start_fen']) ? data['position']['start_fen'] : null;
+ var hiddenboard = chess_from(position, current_display_line.pv, current_display_move);
var moves = hiddenboard.history({ verbose: true });
last_move = moves.pop();
highlight_from = last_move.from;
@@ -1177,7 +1188,9 @@ var update_board = function() {
for (var i = 1; i < alt_moves.length && i < 3; ++i) {
hiddenboard = new Chess(base_fen);
var move = hiddenboard.move(alt_moves[i]);
- create_arrow(move.from, move.to, '#f66', 1, 10);
+ if (move !== null) {
+ create_arrow(move.from, move.to, '#f66', 1, 10);
+ }
}
}
@@ -1279,7 +1292,16 @@ var update_sparkline = function(data) {
chartRangeMin: min_score,
chartRangeMax: max_score,
tooltipFormatter: function(sparkline, options, fields) {
- return format_tooltip(data, fields[0].offset + first_move_num);
+ // score_history contains the Nth _position_, but format_tooltip
+ // wants to format the Nth _move_; thus the -1.
+ return format_tooltip(data, fields[0].offset + first_move_num - 1);
+ }
+ });
+ $('#scorespark').bind('sparklineClick', function(event) {
+ var sparkline = event.sparklines[0];
+ var region = sparkline.getCurrentRegionFields();
+ if (region[0].offset !== undefined) {
+ show_line(0, first_move_num + region[0].offset - 1);
}
});
} else {
@@ -1376,8 +1398,9 @@ var update_clock = function() {
return;
}
- // If either player has ten minutes or less left, add the second counters.
- var show_seconds = (white_clock_ms < 60 * 10 * 1000 || black_clock_ms < 60 * 10 * 1000);
+ // If either player has twenty minutes or less left, add the second counters.
+ // This matches what DGT clocks do.
+ var show_seconds = (white_clock_ms < 60 * 20 * 1000 || black_clock_ms < 60 * 20 * 1000);
if (color) {
// See when the clock will change next, and update right after that.
@@ -1433,15 +1456,15 @@ var format_2d = function(x) {
/**
* @param {string} move
- * @param {Number} move_num
- * @param {boolean} white_to_play
+ * @param {Number} move_num Move number of this move.
+ * @param {boolean} white_to_play Whether white is to play this move.
*/
var format_move_with_number = function(move, move_num, white_to_play) {
var ret;
if (white_to_play) {
- ret = (move_num - 1) + '⦠';
- } else {
ret = move_num + '. ';
+ } else {
+ ret = move_num + '⦠';
}
ret += move;
return ret;
@@ -1449,7 +1472,8 @@ var format_move_with_number = function(move, move_num, white_to_play) {
/**
* @param {string} move
- * @param {Number} halfmove_num
+ * @param {Number} halfmove_num Half-move number that is to be played,
+ * starting from 0.
*/
var format_halfmove_with_number = function(move, halfmove_num) {
return format_move_with_number(
@@ -1463,42 +1487,39 @@ var format_halfmove_with_number = function(move, halfmove_num) {
* @param {Number} halfmove_num
*/
var format_tooltip = function(data, halfmove_num) {
- if (data['score_history'][halfmove_num] ||
- halfmove_num === data['position']['history'].length) {
+ if (data['score_history'][halfmove_num + 1] ||
+ (halfmove_num + 1) === data['position']['history'].length) {
+ // Position is in the history, or it is the current position
+ // (which is implicitly tacked onto the history).
var move;
var short_score;
- if (halfmove_num === data['position']['history'].length) {
+ if ((halfmove_num + 1) === data['position']['history'].length) {
move = data['position']['last_move'];
short_score = format_short_score(data['score']);
} else {
move = data['position']['history'][halfmove_num];
- short_score = format_short_score(data['score_history'][halfmove_num]);
+ short_score = format_short_score(data['score_history'][halfmove_num + 1]);
+ }
+ if (halfmove_num === -1) {
+ return "Start position: " + short_score;
+ } else {
+ var move_with_number = format_halfmove_with_number(move, halfmove_num);
+ return "After " + move_with_number + ": " + short_score;
}
- var move_with_number = format_halfmove_with_number(move, halfmove_num);
-
- return "After " + move_with_number + ": " + short_score;
} else {
- for (var i = halfmove_num; i --> 0; ) {
+ for (var i = halfmove_num; i --> -1; ) {
if (data['score_history'][i]) {
var move = data['position']['history'][i];
- return "[Analysis kept from " + format_halfmove_with_number(move, i) + "]";
+ if (i === -1) {
+ return "[Analysis kept from start position]";
+ } else {
+ return "[Analysis kept from " + format_halfmove_with_number(move, i) + "]";
+ }
}
}
}
}
-/**
- * @param {boolean} sort_by_score
- */
-var resort_refutation_lines = function(sort_by_score) {
- sort_refutation_lines_by_score = sort_by_score;
- if (supports_html5_storage()) {
- localStorage['sort_refutation_lines_by_score'] = sort_by_score ? 1 : 0;
- }
- update_refutation_lines();
-}
-window['resort_refutation_lines'] = resort_refutation_lines;
-
/**
* @param {boolean} truncate_history
*/
@@ -1570,7 +1591,7 @@ var next_game = function() {
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']);
+ switch_backend(current_games[next_game_num]);
return;
}
}
@@ -1588,7 +1609,7 @@ var update_historic_analysis = function() {
}
// Fetch old analysis for this line if it exists.
- var hiddenboard = chess_from(null, current_display_line.pv, current_display_move);
+ var hiddenboard = chess_from(current_display_line.start_fen, current_display_line.pv, current_display_move);
var filename = "/history/move" + (current_display_move + 1) + "-" +
hiddenboard.fen().replace(/ /g, '_').replace(/\//g, '-') + ".json";
@@ -1973,6 +1994,10 @@ var onSnapEnd = function(source, target) {
// this move, then select that. Note that this gives us a good priority
// order (history first, then PV, then multi-PV lines).
for (var i = 0; i < display_lines.length; ++i) {
+ if (i == 1 && current_display_line) {
+ // Do not choose PV if not on it.
+ continue;
+ }
var line = display_lines[i];
if (line.pv[line.start_display_move_num] === move.san) {
show_line(i, 0);
@@ -2061,9 +2086,10 @@ var compute_plot_score = function(score) {
* @param score The score digest tuple.
* @param {?number} depth Depth the move has been computed to, or null.
* @param {boolean} invert Whether black is to play.
+ * @param {boolean=} depth_secondary_key
* @return {number}
*/
-var compute_score_sort_key = function(score, depth, invert) {
+var compute_score_sort_key = function(score, depth, invert, depth_secondary_key) {
var s;
if (!score) {
return -10000000;
@@ -2083,16 +2109,20 @@ var compute_score_sort_key = function(score, depth, invert) {
}
if (s) {
if (invert) s = -s;
- return s * 200 + (depth || 0);
+ if (depth_secondary_key) {
+ return s * 200 + (depth || 0);
+ } else {
+ return s;
+ }
} else {
return null;
}
}
/**
- * @param {string} new_backend_url
+ * @param {Object} game
*/
-var switch_backend = function(new_backend_url, new_backend_hash_url) {
+var switch_backend = function(game) {
// Stop looking at historic data.
current_display_line = null;
current_display_move = null;
@@ -2121,8 +2151,9 @@ var switch_backend = function(new_backend_url, new_backend_hash_url) {
}
// Request an immediate fetch with the new backend.
- backend_url = new_backend_url;
- backend_hash_url = new_backend_hash_url;
+ backend_url = game['url'];
+ backend_hash_url = game['hashurl'];
+ window.location.hash = '#' + game['id'];
current_analysis_data = null;
ims = 0;
request_update();
@@ -2138,11 +2169,6 @@ var init = function() {
} else {
set_sound(false);
}
- if (supports_html5_storage() && localStorage['sort_refutation_lines_by_score']) {
- sort_refutation_lines_by_score = parseInt(localStorage['sort_refutation_lines_by_score']);
- } else {
- sort_refutation_lines_by_score = true;
- }
// Create board.
board = new window.ChessBoard('board', {
@@ -2171,7 +2197,7 @@ var init = function() {
} 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']);
+ switch_backend(current_games[num]);
}
} else if (event.which == 78) { // N.
next_game();