X-Git-Url: https://git.sesse.net/?p=remoteglot;a=blobdiff_plain;f=www%2Fjs%2Fremoteglot.js;h=4e7a2efc262d73e2d6a4dac6aeb5ea11dc410a66;hp=c9b6772cf776952814b80bedf173ca5323965aa2;hb=aae509c47c3031f26f12b5cc084d3f9b48543dd7;hpb=a13ff357bb0ecd37f889690e4e019d474b3c0c5c

diff --git a/www/js/remoteglot.js b/www/js/remoteglot.js
index c9b6772..4e7a2ef 100644
--- a/www/js/remoteglot.js
+++ b/www/js/remoteglot.js
@@ -765,7 +765,7 @@ var update_refutation_lines = function() {
 
 	// Find out where the lines start from.
 	var base_line = [];
-	var base_scores = [];
+	var base_scores = display_lines[1].scores;
 	var start_display_move_num = 0;
 	if (hash_refutation_lines) {
 		base_line = current_display_line.pretty_pv.slice(0, current_display_move + 1);
@@ -899,13 +899,15 @@ var update_game_list = function(games) {
 			// This game.
 			game_span.appendChild(game_name);
 
-			var score;
-			if (current_analysis_data['position']['result']) {
-				score = " (" + current_analysis_data['position']['result'] + ")";
-			} else {
-				score = " (" + format_short_score(current_analysis_data['score']) + ")";
+			if (current_analysis_data && current_analysis_data['position']) {
+				var score;
+				if (current_analysis_data['position']['result']) {
+					score = " (" + current_analysis_data['position']['result'] + ")";
+				} else {
+					score = " (" + format_short_score(current_analysis_data['score']) + ")";
+				}
+				game_span.appendChild(document.createTextNode(score));
 			}
-			game_span.appendChild(document.createTextNode(score));
 		} else {
 			// Some other game.
 			var game_a = document.createElement("a");
@@ -1148,7 +1150,7 @@ var update_board = function() {
 	// Print the PV.
 	$("#pvtitle").text("PV:");
 
-	var scores = [{ first_move: 0, score: data['score'] }];
+	var scores = [{ first_move: -1, score: data['score'] }];
 	$("#pv").html(add_pv(data['position']['fen'], data['pv_pretty'], data['position']['move_num'], data['position']['toplay'], scores, 0));
 
 	// Update the PV arrow.
@@ -1291,6 +1293,8 @@ var update_clock = function() {
 	clearTimeout(clock_timer);
 
 	var data = displayed_analysis_data || current_analysis_data;
+	if (!data) return;
+
 	if (data['position']) {
 		var result = data['position']['result'];
 		if (result === '1-0') {
@@ -1643,6 +1647,9 @@ var update_move_highlight = function() {
 			display_lines.push(current_display_line);
 			$("#pv").html(print_pv(display_lines.length - 1));
 			display_line_num = display_lines.length - 1;
+
+			// Clear out the PV, so it's not selected by anything later.
+			display_lines[1].pretty_pv = [];
 		}
 
 		highlighted_move = $("#automove" + display_line_num + "-" + (current_display_move - current_display_line.start_display_move_num));
@@ -1677,12 +1684,17 @@ var find_display_line_matching_num = function() {
 	return null;
 }
 
+/** Update the board based on the currently displayed line.
+ * 
+ * TODO: This should really be called only whenever something changes,
+ * instead of all the time.
+ */
 var update_displayed_line = function() {
 	if (current_display_line === null) {
 		$("#linenav").hide();
 		$("#linemsg").show();
 		display_fen = base_fen;
-		board.position(base_fen);
+		set_board_position(base_fen);
 		update_imbalance(base_fen);
 		return;
 	}
@@ -1702,18 +1714,23 @@ var update_displayed_line = function() {
 	}
 
 	var hiddenboard = chess_from(current_display_line.start_fen, current_display_line.pretty_pv, current_display_move);
+	set_board_position(hiddenboard.fen());
+	if (display_fen !== hiddenboard.fen() && !current_display_line_is_history) {
+		// Fire off a hash request, since we're now off the main position
+		// and it just changed.
+		explore_hash(hiddenboard.fen());
+	}
 	display_fen = hiddenboard.fen();
+	update_imbalance(hiddenboard.fen());
+}
+
+var set_board_position = function(new_fen) {
 	board_is_animating = true;
 	var old_fen = board.fen();
-	board.position(hiddenboard.fen());
+	board.position(new_fen);
 	if (board.fen() === old_fen) {
 		board_is_animating = false;
-	} else if (!current_display_line_is_history) {
-		// Fire off a hash request, since we're now off the main position
-		// and it just changed.
-		explore_hash(display_fen);
 	}
-	update_imbalance(hiddenboard.fen());
 }
 
 /**
@@ -1989,6 +2006,9 @@ var format_short_score = function(score) {
 }
 
 var format_long_score = function(score) {
+	if (!score) {
+		return "???";
+	}
 	if (score[0] === 'm') {
 		if (score[1] > 0) {
 			return "White mates in " + score[1];