X-Git-Url: https://git.sesse.net/?p=remoteglot;a=blobdiff_plain;f=www%2Fjs%2Fremoteglot.js;h=da9f70a17f49522d464f8ba6236d47beaeccf8c1;hp=f21273edd8a0f4e49bb9f24e6989d99b0a6458d5;hb=e013c00f3db60d47d7911b7c2e6c2219d5e1a148;hpb=078813087093cd7971d52bb5fe0e814c432f03a2

diff --git a/www/js/remoteglot.js b/www/js/remoteglot.js
index f21273e..da9f70a 100644
--- a/www/js/remoteglot.js
+++ b/www/js/remoteglot.js
@@ -20,6 +20,9 @@ var backend_url = "/analysis.pl";
 /** @type {window.ChessBoard} @private */
 var board = null;
 
+/** @type {boolean} @private */
+var board_is_animating = false;
+
 /**
  * The most recent analysis data we have from the server
  * (about the most recent position).
@@ -37,6 +40,18 @@ var current_analysis_data = null;
  */
 var displayed_analysis_data = null;
 
+/**
+ * Games currently in progress, if any.
+ *
+ * @type {?Array.<{
+ *      name: string,
+ *      url: string,
+ *      id: string,
+ * }>}
+ * @private
+ */
+var current_games = null;
+
 /** @type {Array.<{
  *      from_col: number,
  *      from_row: number,
@@ -76,7 +91,9 @@ var highlight_from = undefined;
 /** @type {!string|undefined} @private */
 var highlight_to = undefined;
 
-/** @type {?jQuery} @private */
+/** The HTML object of the move currently being highlighted (in red).
+ * @type {?jQuery}
+ * @private */
 var highlighted_move = null;
 
 /** @type {?number} @private */
@@ -105,13 +122,17 @@ var fen = null;
 
 /** @typedef {{
  *    start_fen: string,
- *    uci_pv: Array.<string>,
  *    pretty_pv: Array.<string>,
- *    line_num: number
  * }} DisplayLine
  */
 
-/** @type {Array.<DisplayLine>}
+/** All PVs that we currently know of.
+ *
+ * Element 0 is history (or null if no history).
+ * Element 1 is current main PV.
+ * All remaining elements are refutation lines (multi-PV).
+ *
+ * @type {Array.<DisplayLine>}
  * @private
  */
 var display_lines = [];
@@ -198,7 +219,7 @@ var request_update = function() {
 
 		possibly_play_sound(current_analysis_data, new_data);
 		current_analysis_data = new_data;
-		update_board(current_analysis_data, displayed_analysis_data);
+		update_board();
 		update_num_viewers(num_viewers);
 
 		// Next update.
@@ -252,7 +273,9 @@ var sync_server_clock = function(server_date_string) {
 var clear_arrows = function() {
 	for (var i = 0; i < arrows.length; ++i) {
 		if (arrows[i].svg) {
-			arrows[i].svg.parentElement.removeChild(arrows[i].svg);
+			if (arrows[i].svg.parentElement) {
+				arrows[i].svg.parentElement.removeChild(arrows[i].svg);
+			}
 			delete arrows[i].svg;
 		}
 	}
@@ -367,7 +390,9 @@ var point_from_end = function(x1, y1, x2, y2, t, u) {
 
 var position_arrow = function(arrow) {
 	if (arrow.svg) {
-		arrow.svg.parentElement.removeChild(arrow.svg);
+		if (arrow.svg.parentElement) {
+			arrow.svg.parentElement.removeChild(arrow.svg);
+		}
 		delete arrow.svg;
 	}
 	if (current_display_line !== null && !current_display_line_is_history) {
@@ -548,7 +573,6 @@ var add_pv = function(fen, pretty_pv, move_num, toplay, opt_limit, opt_showlast)
 	display_lines.push({
 		start_fen: fen,
 		pretty_pv: pretty_pv,
-		line_number: display_lines.length
 	});
 	return print_pv(display_lines.length - 1, pretty_pv, move_num, toplay, opt_limit, opt_showlast);
 }
@@ -603,7 +627,10 @@ var print_pv = function(line_num, pretty_pv, move_num, toplay, opt_limit, opt_sh
 	return pv;
 }
 
-var update_highlight = function() {
+/** Update the highlighted to/from squares on the board.
+ * Based on the global "highlight_from" and "highlight_to" variables.
+ */
+var update_board_highlight = function() {
 	$("#board").find('.square-55d63').removeClass('nonuglyhighlight');
 	if ((current_display_line === null || current_display_line_is_history) &&
 	    highlight_from !== undefined && highlight_to !== undefined) {
@@ -633,11 +660,16 @@ var collapse_history = function(truncate_history) {
 }
 window['collapse_history'] = collapse_history;
 
+/** Update the HTML display of multi-PV from the global "refutation_lines".
+ *
+ * Also recreates the global "display_lines".
+ */
 var update_refutation_lines = function() {
 	if (fen === null) {
 		return;
 	}
 	if (display_lines.length > 2) {
+		// Truncate so that only the history and PV is left.
 		display_lines = [ display_lines[0], display_lines[1] ];
 	}
 
@@ -691,9 +723,15 @@ var update_refutation_lines = function() {
 		$("#sortbyscore0").html("<strong>Move</strong>");
 		$("#sortbyscore1").html("<a href=\"javascript:resort_refutation_lines(true)\">Score</a>");
 	}
+
+	// Update the move highlight, as we've rewritten all the HTML.
+	update_move_highlight();
 }
 
 /**
+ * Create a Chess.js board object, containing the given position plus the given moves,
+ * up to the given limit.
+ *
  * @param {?string} fen
  * @param {Array.<string>} moves
  * @param {number} last_move
@@ -715,12 +753,56 @@ var chess_from = function(fen, moves, last_move) {
 	return hiddenboard;
 }
 
+var update_game_list = function(games) {
+	$("#games").text("");
+	if (games === null) {
+		return;
+	}
+
+	var games_div = document.getElementById('games');
+	for (var game_num = 0; game_num < games.length; ++game_num) {
+		var game = games[game_num];
+		var game_span = document.createElement("span");
+		game_span.setAttribute("class", "game");
+
+		var game_name = document.createTextNode(game['name']);
+		if (game['url'] === backend_url) {
+			game_span.appendChild(game_name);
+		} else {
+			var game_a = document.createElement("a");
+			game_a.setAttribute("href", "#" + game['id']);
+			game_a.appendChild(game_name);
+			game_span.appendChild(game_a);
+		}
+		games_div.appendChild(game_span);
+	}
+}
+
 /**
- * @param {Object} data
- * @param {?Object} display_data
+ * Try to find a running game that matches with the current hash,
+ * and switch to it if we're not already displaying it.
  */
-var update_board = function(current_data, display_data) {
-	var data = display_data || current_data;
+var possibly_switch_game_from_hash = function() {
+	if (current_games === null) {
+		return;
+	}
+
+	var hash = window.location.hash.replace(/^#/,'');
+	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']);
+			}
+			return;
+		}
+	}
+}
+
+/** Update all the HTML on the page, based on current global state.
+ */
+var update_board = function() {
+	var data = displayed_analysis_data || current_analysis_data;
+	var current_data = current_analysis_data;  // Convenience alias.
 
 	display_lines = [];
 
@@ -734,6 +816,16 @@ var update_board = function(current_data, display_data) {
 	}
 	update_history();
 
+	// Games currently in progress, if any.
+	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);
+	}
+
 	// The headline. Names are always fetched from current_data;
 	// the rest can depend a bit.
 	var headline;
@@ -745,8 +837,52 @@ var update_board = function(current_data, display_data) {
 		headline = 'Analysis';
 	}
 
+	// Credits, where applicable. Note that we don't want the footer to change a lot
+	// when e.g. viewing history, so if any of these changed during the game,
+	// use the current one still.
+	if (current_data['using_lomonosov']) {
+		$("#lomonosov").show();
+	} else {
+		$("#lomonosov").hide();
+	}
+
+	// Credits: The engine name/version.
+	if (current_data['engine'] && current_data['engine']['name'] !== null) {
+		$("#engineid").text(current_data['engine']['name']);
+	}
+
+	// Credits: The engine URL.
+	if (current_data['engine'] && current_data['engine']['url']) {
+		$("#engineid").attr("href", current_data['engine']['url']);
+	} else {
+		$("#engineid").removeAttr("href");
+	}
+
+	// Credits: Engine details.
+	if (current_data['engine'] && current_data['engine']['details']) {
+		$("#enginedetails").text(" (" + current_data['engine']['details'] + ")");
+	} else {
+		$("#enginedetails").text("");
+	}
+
+	// Credits: Move source, possibly with URL.
+	if (current_data['move_source'] && current_data['move_source_url']) {
+		$("#movesource").text("Moves provided by ");
+		var movesource_a = document.createElement("a");
+		movesource_a.setAttribute("href", current_data['move_source_url']);
+		var movesource_text = document.createTextNode(current_data['move_source']);
+		movesource_a.appendChild(movesource_text);
+		var movesource_period = document.createTextNode(".");
+		document.getElementById("movesource").appendChild(movesource_a);
+		document.getElementById("movesource").appendChild(movesource_period);
+	} else if (current_data['move_source']) {
+		$("#movesource").text("Moves provided by " + current_data['move_source'] + ".");
+	} else {
+		$("#movesource").text("");
+	}
+
 	var last_move;
-	if (display_data) {
+	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(
@@ -795,10 +931,11 @@ var update_board = function(current_data, display_data) {
 	} else {
 		highlight_from = highlight_to = undefined;
 	}
-	update_highlight();
+	update_board_highlight();
 
 	if (data['failed']) {
 		$("#score").text("No analysis for this move");
+		$("#pvtitle").text("PV:");
 		$("#pv").empty();
 		$("#searchstats").html("&nbsp;");
 		$("#refutationlines").empty();
@@ -808,16 +945,12 @@ var update_board = function(current_data, display_data) {
 		update_refutation_lines();
 		clear_arrows();
 		update_displayed_line();
+		update_move_highlight();
 		return;
 	}
 
 	update_clock();
 
-	// The engine id.
-	if (data['id'] && data['id']['name'] !== null) {
-		$("#engineid").text(data['id']['name']);
-	}
-
 	// The score.
 	if (data['score'] !== null) {
 		$("#score").text(data['score']);
@@ -849,6 +982,7 @@ var update_board = function(current_data, display_data) {
 	update_displayed_line();
 
 	// Print the PV.
+	$("#pvtitle").text("PV:");
 	$("#pv").html(add_pv(data['position']['fen'], data['pv_pretty'], data['position']['move_num'], data['position']['toplay']));
 
 	// Update the PV arrow.
@@ -1203,17 +1337,18 @@ var show_line = function(line_num, move_num) {
 			// TODO: Support exiting to history position if we are in an
 			// analysis line of a history position.
 			displayed_analysis_data = null;
-			update_board(current_analysis_data, displayed_analysis_data);
+			update_board();
 		}
 	} else {
-		current_display_line = display_lines[line_num];
+		current_display_line = jQuery.extend({}, display_lines[line_num]);  // Shallow clone.
 		current_display_move = move_num;
 	}
 	current_display_line_is_history = (line_num == 0);
 
 	update_historic_analysis();
 	update_displayed_line();
-	update_highlight();
+	update_board_highlight();
+	update_move_highlight();
 	redraw_arrows();
 }
 window['show_line'] = show_line;
@@ -1224,6 +1359,7 @@ var prev_move = function() {
 	}
 	update_historic_analysis();
 	update_displayed_line();
+	update_move_highlight();
 }
 window['prev_move'] = prev_move;
 
@@ -1233,6 +1369,7 @@ var next_move = function() {
 	}
 	update_historic_analysis();
 	update_displayed_line();
+	update_move_highlight();
 }
 window['next_move'] = next_move;
 
@@ -1242,7 +1379,7 @@ var update_historic_analysis = function() {
 	}
 	if (current_display_move == current_display_line.pretty_pv.length - 1) {
 		displayed_analysis_data = null;
-		update_board(current_analysis_data, displayed_analysis_data);
+		update_board();
 	}
 
 	// Fetch old analysis for this line if it exists.
@@ -1254,14 +1391,14 @@ var update_historic_analysis = function() {
 		url: filename
 	}).done(function(data, textstatus, xhr) {
 		displayed_analysis_data = data;
-		update_board(current_analysis_data, displayed_analysis_data);
+		update_board();
 	}).fail(function(jqXHR, textStatus, errorThrown) {
 		if (textStatus === "abort") {
 			// Aborted because we are switching backends. Don't do anything;
 			// we will already have been cleared.
 		} else {
 			displayed_analysis_data = {'failed': true};
-			update_board(current_analysis_data, displayed_analysis_data);
+			update_board();
 		}
 	});
 }
@@ -1301,10 +1438,37 @@ var update_imbalance = function(fen) {
 	$('#blackimbalance').html(black_imbalance);
 }
 
-var update_displayed_line = function() {
+/** Mark the currently selected move in red.
+ */
+var update_move_highlight = function() {
 	if (highlighted_move !== null) {
 		highlighted_move.removeClass('highlight'); 
 	}
+	if (current_display_line) {
+		// See if the current displayed line is identical to any of the ones
+		// we have on screen. (It might not be if e.g. the analysis reloaded
+		// since we started looking.)
+		for (var i = 0; i < display_lines.length; ++i) {
+			var line = display_lines[i];
+			if (current_display_line.start_fen !== line.start_fen) continue;
+			if (current_display_line.pretty_pv.length !== line.pretty_pv.length) continue;
+			var ok = true;
+			for (var j = 0; j < line.pretty_pv.length; ++j) {
+				if (current_display_line.pretty_pv[j] !== line.pretty_pv[j]) {
+					ok = false;
+					break;
+				}
+			}
+			if (ok) {
+				highlighted_move = $("#automove" + i + "-" + current_display_move);
+				highlighted_move.addClass('highlight');
+				break;
+			}
+		}
+	}
+}
+
+var update_displayed_line = function() {
 	if (current_display_line === null) {
 		$("#linenav").hide();
 		$("#linemsg").show();
@@ -1327,11 +1491,11 @@ var update_displayed_line = function() {
 		$("#nextmove").html("<a href=\"javascript:next_move();\">Next</a></span>");
 	}
 
-	highlighted_move = $("#automove" + current_display_line.line_number + "-" + current_display_move);
-	highlighted_move.addClass('highlight'); 
-
 	var hiddenboard = chess_from(current_display_line.start_fen, current_display_line.pretty_pv, current_display_move);
+	board_is_animating = true;
+	var old_fen = board.fen();
 	board.position(hiddenboard.fen());
+	if (board.fen() === old_fen) board_is_animating = false;
 	update_imbalance(hiddenboard.fen());
 }
 
@@ -1387,6 +1551,7 @@ var switch_backend = function(new_backend_url) {
 
 	// Request an immediate fetch with the new backend.
 	backend_url = new_backend_url;
+	current_analysis_data = null;
 	ims = 0;
 	request_update();
 }
@@ -1408,13 +1573,15 @@ var init = function() {
 	}
 
 	// Create board.
-	board = new window.ChessBoard('board', 'start');
+	board = new window.ChessBoard('board', {
+		onMoveEnd: function() { board_is_animating = false; }
+	});
 
 	request_update();
 	$(window).resize(function() {
 		board.resize();
 		update_sparkline(displayed_analysis_data || current_analysis_data);
-		update_highlight();
+		update_board_highlight();
 		redraw_arrows();
 	});
 	$(window).keyup(function(event) {
@@ -1424,6 +1591,7 @@ var init = function() {
 			prev_move();
 		}
 	});
+	window.addEventListener('hashchange', possibly_switch_game_from_hash, false);
 };
 $(document).ready(init);