X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=www%2Fjs%2Fremoteglot.js;h=bed5a5cdf8ad3d1fdd4de3eb9cff1f8b39d17b4b;hb=d9f38cb28bf7ceac256e78c47043cb08a5e2da3a;hp=d14571792bff114783834c973a4873ea95d2ebc9;hpb=aa1babedfa5d21ffdcbb1b105ea87f81b44d406e;p=remoteglot
diff --git a/www/js/remoteglot.js b/www/js/remoteglot.js
index d145717..bed5a5c 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 = 2016113008;
/**
* The current backend URL.
@@ -94,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;
@@ -277,13 +274,33 @@ 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.");
+ setTimeout(function() { location.reload(true); }, 5000);
+ }
// Next update.
- current_analysis_request_timer = setTimeout(function() { request_update(); }, 100);
+ if (!backend_url.match(/history/)) {
+ 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,
@@ -459,17 +476,25 @@ var position_arrow = function(arrow) {
return;
}
- var pos = $(".square-a8").position();
-
var zoom_factor = $("#board").width() / 400.0;
var line_width = arrow.line_width * zoom_factor;
var arrow_size = arrow.arrow_size * zoom_factor;
var square_width = $(".square-a8").width();
- var from_y = (7 - arrow.from_row + 0.5)*square_width;
- var to_y = (7 - arrow.to_row + 0.5)*square_width;
- var from_x = (arrow.from_col + 0.5)*square_width;
- var to_x = (arrow.to_col + 0.5)*square_width;
+ var pos, from_y, to_y, from_x, to_x;
+ if (board.orientation() === 'black') {
+ pos = $(".square-h1").position();
+ from_y = (arrow.from_row + 0.5)*square_width;
+ to_y = (arrow.to_row + 0.5)*square_width;
+ from_x = (7 - arrow.from_col + 0.5)*square_width;
+ to_x = (7 - arrow.to_col + 0.5)*square_width;
+ } else {
+ pos = $(".square-a8").position();
+ from_y = (7 - arrow.from_row + 0.5)*square_width;
+ to_y = (7 - arrow.to_row + 0.5)*square_width;
+ from_x = (arrow.from_col + 0.5)*square_width;
+ to_x = (arrow.to_col + 0.5)*square_width;
+ }
var SVG_NS = "http://www.w3.org/2000/svg";
var XHTML_NS = "http://www.w3.org/1999/xhtml";
@@ -551,15 +576,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);
@@ -764,6 +780,10 @@ var update_refutation_lines = function() {
var tbl = $("#refutationlines");
tbl.empty();
+ if (display_lines.length < 2) {
+ return;
+ }
+
// Find out where the lines start from.
var base_line = [];
var base_scores = display_lines[1].scores;
@@ -780,11 +800,10 @@ var update_refutation_lines = function() {
}
var invert = (toplay === 'B');
- if (current_display_line && current_display_move % 2 == 0) {
+ if (current_display_line && current_display_move % 2 == 0 && !current_display_line_is_history) {
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]];
@@ -845,15 +864,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();
}
@@ -868,7 +878,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) {
@@ -934,6 +944,18 @@ var update_game_list = function(games) {
* and switch to it if we're not already displaying it.
*/
var possibly_switch_game_from_hash = function() {
+ var history_match = window.location.hash.match(/^#history=([a-zA-Z0-9_-]+)/);
+ if (history_match !== null) {
+ var game_id = history_match[1];
+ var fake_game = {
+ url: '/history/' + game_id + '.json',
+ hashurl: '',
+ id: 'history=' + game_id
+ };
+ switch_backend(fake_game);
+ return;
+ }
+
if (current_games === null) {
return;
}
@@ -949,6 +971,32 @@ var possibly_switch_game_from_hash = function() {
}
}
+/**
+ * If this is a Chess960 castling which doesn't move the king,
+ * move the rook instead.
+*/
+var patch_move = function(move) {
+ if (move === null) return null;
+ if (move.from !== move.to) return move;
+
+ var f = move.rook_sq & 15;
+ var r = move.rook_sq >> 4;
+ var from = ('abcdefgh'.substring(f,f+1) + '87654321'.substring(r,r+1));
+ var to = move.to;
+
+ if (move.to === 'g1') {
+ to = 'f1';
+ } else if (move.to === 'g8') {
+ to = 'f8';
+ } else if (move.to === 'b1') {
+ to = 'c1';
+ } else if (move.to === 'b8') {
+ to = 'c8';
+ }
+
+ return { from: from, to: to };
+}
+
/** Update all the HTML on the page, based on current global state.
*/
var update_board = function() {
@@ -961,7 +1009,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);
}
@@ -1035,15 +1084,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;
@@ -1071,11 +1132,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;
@@ -1164,21 +1226,24 @@ var update_board = function() {
// draw a continuation arrow as long as it's the same piece
var last_to;
for (var i = 0; i < data['pv'].length; i += 2) {
- var move = hiddenboard.move(data['pv'][i]);
+ var move = patch_move(hiddenboard.move(data['pv'][i]));
+
if ((i >= 2 && move.from != last_to) ||
interfering_arrow(move.from, move.to)) {
break;
}
create_arrow(move.from, move.to, '#f66', 6, 20);
- last_to = move.from;
+ last_to = move.to;
hiddenboard.move(data['pv'][i + 1]); // To keep continuity.
}
var alt_moves = find_nonstupid_moves(data, 30, data['position']['toplay'] === 'B');
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);
+ var move = patch_move(hiddenboard.move(alt_moves[i]));
+ if (move !== null) {
+ create_arrow(move.from, move.to, '#f66', 1, 10);
+ }
}
}
@@ -1199,7 +1264,7 @@ var update_board = function() {
if (!data['refutation_lines'] ||
!data['refutation_lines'][nonstupid_moves[i]] ||
!data['refutation_lines'][nonstupid_moves[i]]['pv'] ||
- data['refutation_lines'][nonstupid_moves[i]]['pv'].length < 1) {
+ data['refutation_lines'][nonstupid_moves[i]]['pv'].length < 2) {
// Incomplete PV, abort.
response = undefined;
break;
@@ -1280,7 +1345,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 {
@@ -1377,8 +1451,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.
@@ -1434,15 +1509,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;
@@ -1450,7 +1525,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(
@@ -1464,42 +1540,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
*/
@@ -1589,7 +1662,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";
@@ -2140,6 +2213,8 @@ var switch_backend = function(game) {
}
window['switch_backend'] = switch_backend;
+window['flip'] = function() { board.flip(); redraw_arrows(); };
+
var init = function() {
unique = get_unique();
@@ -2149,11 +2224,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', {
@@ -2189,6 +2259,7 @@ var init = function() {
}
});
window.addEventListener('hashchange', possibly_switch_game_from_hash, false);
+ possibly_switch_game_from_hash();
};
$(document).ready(init);