X-Git-Url: https://git.sesse.net/?p=remoteglot;a=blobdiff_plain;f=www%2Fjs%2Fremoteglot.js;h=ff566ab85c81c4ba4b33ff8a9853bec23d8f89ca;hp=b049c32ea81bc52c63b1cbb19172d7c769778b21;hb=01a8eaa3db2c015b25c0cf53df96b12493f3db58;hpb=6e6dd05d710c027aa19ac1605668e2017c4f441f
diff --git a/www/js/remoteglot.js b/www/js/remoteglot.js
index b049c32..ff566ab 100644
--- a/www/js/remoteglot.js
+++ b/www/js/remoteglot.js
@@ -7,7 +7,7 @@
* @type {Number}
* @const
* @private */
-var SCRIPT_VERSION = 2016091401;
+var SCRIPT_VERSION = 2016113002;
/**
* 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;
@@ -569,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);
@@ -801,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]];
@@ -863,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();
}
@@ -886,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) {
@@ -979,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);
}
@@ -1053,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;
@@ -1093,7 +1084,8 @@ var update_board = function() {
// 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;
@@ -1196,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);
+ }
}
}
@@ -1298,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 {
@@ -1395,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.
@@ -1452,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;
@@ -1468,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(
@@ -1482,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
*/
@@ -1607,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";
@@ -2167,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', {