X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=www%2Fjs%2Fremoteglot.js;h=594759157e5d1fa664fe146c824a56f6c5222c37;hb=190f64548b562d0086e98445153e6ec96a47a275;hp=7135953fb2298b579393d2a2668a28279fb59436;hpb=b2779e155a09b1a3fcc2e132aaafbbbe4884ed49;p=remoteglot

diff --git a/www/js/remoteglot.js b/www/js/remoteglot.js
index 7135953..5947591 100644
--- a/www/js/remoteglot.js
+++ b/www/js/remoteglot.js
@@ -5,7 +5,7 @@
  * Version of this script. If the server returns a version larger than
  * this, it is a sign we should reload to upgrade ourselves.
  *
- * @type {Number}
+ * @type {number}
  * @const
  * @private */
 let SCRIPT_VERSION = 2023122700;
@@ -76,6 +76,18 @@ let occupied_by_arrows = [];
 /** Currently displayed refutation lines (on-screen).
  * Can either come from the current_analysis_data, displayed_analysis_data,
  * or hash_refutation_lines.
+ *
+ * TODO: This is a mess, and we should probably just let update_refutation_lines()
+ * decide anew every time instead of storing the state here in multiple global
+ * variables.
+ *
+ * @type {Array.<{
+ *     score: Array,
+ *     depth: string,
+ *     pv: Array.<string>,
+ *     move: string
+ * }>}
+ * @private
  */
 let refutation_lines = [];
 
@@ -86,6 +98,12 @@ let refutation_lines = [];
  */
 let hash_refutation_lines = null;
 
+/**
+ * What FEN refutation_lines is relative to. Will usually be base_fen,
+ * but if another move gets loaded while we are looking, they can diverge.
+ */
+let refutation_lines_base_fen = null;
+
 /** @type {number} @private */
 let ims = 0;
 
@@ -161,11 +179,12 @@ let display_fen = null;
  *    toplay: string,
  *    scores: Array<{first_move: number, score: Object}>,
  *    start_display_move_num: number
- * }} DisplayLine
+ * }}
  *
  * "start_display_move_num" is the (half-)move number to start displaying the PV at.
  * "score" is also evaluated at this point.
  */
+var DisplayLine;
 
 /** All PVs that we currently know of.
  *
@@ -200,7 +219,7 @@ let current_analysis_xhr = null;
  * The current timer to fire off a request to get main analysis (not history),
  * if any, so that we can abort it.
  *
- * @type {?Number}
+ * @type {?number}
  * @private
  */
 let current_analysis_request_timer = null;
@@ -225,7 +244,7 @@ let current_hash_xhr = null;
  * The current timer to display hash probe information (it could be waiting on the
  * board to stop animating), if any, so that we can abort it.
  *
- * @type {?Number}
+ * @type {?number}
  * @private
  */
 let current_hash_display_timer = null;
@@ -687,7 +706,7 @@ function thousands(x) {
 /**
  * @param {!string} start_fen
  * @param {Array.<string>} pv
- * @param {Array<{ first_move: integer, score: Object }>} scores
+ * @param {Array<{ first_move: number, score: Object }>} scores
  * @param {number} start_display_move_num
  * @param {number=} opt_limit
  * @param {boolean=} opt_showlast
@@ -851,7 +870,7 @@ window['collapse_history'] = collapse_history;
  * Also recreates the global "display_lines".
  */
 function update_refutation_lines() {
-	if (base_fen === null) {
+	if (refutation_lines_base_fen === null) {
 		return;
 	}
 	if (display_lines.length > 2) {
@@ -882,7 +901,7 @@ function update_refutation_lines() {
 		moves.push(move);
 	}
 
-	let invert = (find_toplay(base_fen) === 'b');
+	let invert = (find_toplay(refutation_lines_base_fen) === 'b');
 	if (current_display_line && current_display_move % 2 == 0 && !current_display_line_is_history) {
 		invert = !invert;
 	}
@@ -919,7 +938,7 @@ function update_refutation_lines() {
 			let pv_td = document.createElement("td");
 			tr.appendChild(pv_td);
 			pv_td.classList.add("pv");
-			pv_td.append(add_pv(base_fen, base_line.concat([ line['move'] ]), scores, start_display_move_num));
+			pv_td.append(add_pv(refutation_lines_base_fen, base_line.concat([ line['move'] ]), scores, start_display_move_num));
 
 			tbl.append(tr);
 			continue;
@@ -948,7 +967,7 @@ function update_refutation_lines() {
 		let pv_td = document.createElement("td");
 		tr.appendChild(pv_td);
 		pv_td.classList.add("pv");
-		pv_td.append(add_pv(base_fen, base_line.concat(line['pv']), scores, start_display_move_num, 10));
+		pv_td.append(add_pv(refutation_lines_base_fen, base_line.concat(line['pv']), scores, start_display_move_num, 10));
 
 		tbl.append(tr);
 	}
@@ -1239,6 +1258,7 @@ function update_board() {
 		document.getElementById("whiteclock").replaceChildren();
 		document.getElementById("blackclock").replaceChildren();
 		refutation_lines = [];
+		refutation_lines_base_fen = null;
 		update_refutation_lines();
 		clear_arrows();
 		update_displayed_line();
@@ -1377,7 +1397,10 @@ function update_board() {
 
 	// Update the refutation lines.
 	base_fen = data['position']['fen'];
-	refutation_lines = hash_refutation_lines || data['refutation_lines'];
+	if (hash_refutation_lines === null) {
+		refutation_lines = data['refutation_lines'];
+		refutation_lines_base_fen = base_fen;
+	}
 	update_refutation_lines();
 
 	// Update the sparkline last, since its size depends on how everything else reflowed.
@@ -1620,7 +1643,7 @@ function update_clock() {
 }
 
 /**
- * @param {Number} remaining_ms
+ * @param {number} remaining_ms
  * @param {boolean} show_seconds
  */
 function format_clock(remaining_ms, show_seconds) {
@@ -1646,7 +1669,7 @@ function format_clock(remaining_ms, show_seconds) {
 }
 
 /**
- * @param {Number} x
+ * @param {number} x
  */
 function format_2d(x) {
 	if (x >= 10) {
@@ -1658,7 +1681,7 @@ function format_2d(x) {
 
 /**
  * @param {string} move
- * @param {Number} move_num Move number of this move.
+ * @param {number} move_num Move number of this move.
  * @param {boolean} white_to_play Whether white is to play this move.
  */
 function format_move_with_number(move, move_num, white_to_play) {
@@ -1674,7 +1697,7 @@ function format_move_with_number(move, move_num, white_to_play) {
 
 /**
  * @param {string} move
- * @param {Number} halfmove_num Half-move number that is to be played,
+ * @param {number} halfmove_num Half-move number that is to be played,
  *   starting from 0.
  */
 function format_halfmove_with_number(move, halfmove_num) {
@@ -1686,7 +1709,7 @@ function format_halfmove_with_number(move, halfmove_num) {
 
 /**
  * @param {Object} data
- * @param {Number} halfmove_num
+ * @param {number} halfmove_num
  */
 function format_tooltip(data, halfmove_num) {
 	if (data['score_history'][halfmove_num + 1] ||
@@ -1740,6 +1763,7 @@ function show_line(line_num, move_num) {
 		current_display_line = null;
 		current_display_move = null;
 		hash_refutation_lines = null;
+		refutation_lines_base_fen = base_fen;
 		if (displayed_analysis_data) {
 			// TODO: Support exiting to history position if we are in an
 			// analysis line of a history position.
@@ -2065,6 +2089,7 @@ function show_explore_hash_results(data, fen) {
 	}
 	current_hash_display_timer = null;
 	hash_refutation_lines = data['lines'];
+	refutation_lines_base_fen = fen;
 	update_board();
 }