X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=www%2Fjs%2Fremoteglot.js;h=a5cdc232a61ce3a6cfa2b90508411b467b4e6202;hb=bf646866821723c84ac275cab2314a43aed20d64;hp=3189396c170526376c67492f4d380b0506a8a6f8;hpb=03589159724197675255fe65ee9debd275e3e631;p=remoteglot

diff --git a/www/js/remoteglot.js b/www/js/remoteglot.js
index 3189396..a5cdc23 100644
--- a/www/js/remoteglot.js
+++ b/www/js/remoteglot.js
@@ -45,6 +45,9 @@ var highlight_from = undefined;
 /** @type {!string|undefined} @private */
 var highlight_to = undefined;
 
+/** @type {?jQuery} @private */
+var highlighted_move = null;
+
 /** @type {!number} @private */
 var unique = Math.random();
 
@@ -57,7 +60,8 @@ var fen = null;
 /** @typedef {{
  *    start_fen: string,
  *    uci_pv: Array.<string>,
- *    pretty_pv: Array.<string>
+ *    pretty_pv: Array.<string>,
+ *    line_num: number
  * }} DisplayLine
  */
 
@@ -386,7 +390,8 @@ var add_pv = function(fen, uci_pv, pretty_pv, move_num, toplay, opt_limit, opt_s
 	display_lines.push({
 		start_fen: fen,
 		uci_pv: uci_pv,
-		pretty_pv: pretty_pv 
+		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);
 }
@@ -414,14 +419,14 @@ var print_pv = function(line_num, pretty_pv, move_num, toplay, opt_limit, opt_sh
 		}
 		move_num += i / 2;
 	} else if (toplay == 'B') {
-		var move = "<a class=\"move\" href=\"javascript:show_line(" + line_num + ", " + 0 + ");\">" + pretty_pv[0] + "</a>";
+		var move = "<a class=\"move\" id=\"automove" + line_num + "-0\" href=\"javascript:show_line(" + line_num + ", " + 0 + ");\">" + pretty_pv[0] + "</a>";
 		pv = move_num + '. … ' + move;
 		toplay = 'W';
 		++i;
 		++move_num;
 	}
 	for ( ; i < pretty_pv.length; ++i) {
-		var move = "<a class=\"move\" href=\"javascript:show_line(" + line_num + ", " + i + ");\">" + pretty_pv[i] + "</a>";
+		var move = "<a class=\"move\" id=\"automove" + line_num + "-" + i + "\" href=\"javascript:show_line(" + line_num + ", " + i + ");\">" + pretty_pv[i] + "</a>";
 
 		if (toplay == 'W') {
 			if (i > opt_limit && !opt_showlast) {
@@ -474,8 +479,8 @@ var update_refutation_lines = function() {
 	if (fen === null) {
 		return;
 	}
-	if (display_lines.length > 1) {
-		display_lines = [ display_lines[0] ];
+	if (display_lines.length > 2) {
+		display_lines = [ display_lines[0], display_lines[1] ];
 	}
 
 	var tbl = $("#refutationlines");
@@ -598,7 +603,7 @@ var update_board = function(data, num_viewers) {
 
 	if (data['position']['last_move_uci']) {
 		highlight_from = data['position']['last_move_uci'].substr(0, 2);
-		highlight_to = data['position']['last_move_uci'].substr(2, 4);
+		highlight_to = data['position']['last_move_uci'].substr(2, 2);
 	} else {
 		highlight_from = highlight_to = undefined;
 	}
@@ -608,7 +613,7 @@ var update_board = function(data, num_viewers) {
 	if (data['position']['history']) {
 		add_pv('start', data['position']['history'], data['position']['pretty_history'], 1, 'W', 8, true);
 	} else {
-		displayed_lines.push(null);
+		display_lines.push(null);
 	}
 	update_history();
 
@@ -622,7 +627,7 @@ var update_board = function(data, num_viewers) {
 		for (var i = 0; i < data['pv_uci'].length; i += 2) {
 			var from = data['pv_uci'][i].substr(0, 2);
 			var to = data['pv_uci'][i].substr(2,4);
-			if ((i >= 2 && from != data['pv_uci'][i - 2].substr(2, 4)) ||
+			if ((i >= 2 && from != data['pv_uci'][i - 2].substr(2, 2)) ||
 			     interfering_arrow(from, to)) {
 				break;
 			}
@@ -632,7 +637,7 @@ var update_board = function(data, num_viewers) {
 		var alt_moves = find_nonstupid_moves(data, 30);
 		for (var i = 1; i < alt_moves.length && i < 3; ++i) {
 			create_arrow(alt_moves[i].substr(0, 2),
-				     alt_moves[i].substr(2, 4), '#f66', 1, 10);
+				     alt_moves[i].substr(2, 2), '#f66', 1, 10);
 		}
 	}
 
@@ -663,7 +668,7 @@ var update_board = function(data, num_viewers) {
 
 		if (nonstupid_moves.length > 0 && response !== undefined) {
 			create_arrow(response.substr(0, 2),
-				     response.substr(2, 4), '#66f', 6, 20);
+				     response.substr(2, 2), '#66f', 6, 20);
 		}
 	}
 
@@ -731,6 +736,9 @@ var next_move = function() {
 window['next_move'] = next_move;
 
 var update_displayed_line = function() {
+	if (highlighted_move !== null) {
+		highlighted_move.removeClass('highlight'); 
+	}
 	if (current_display_line === null) {
 		$("#linenav").hide();
 		$("#linemsg").show();
@@ -741,7 +749,7 @@ var update_displayed_line = function() {
 	$("#linenav").show();
 	$("#linemsg").hide();
 
-	if (current_display_move == 0) {
+	if (current_display_move <= 0) {
 		$("#prevmove").html("Previous");
 	} else {
 		$("#prevmove").html("<a href=\"javascript:prev_move();\">Previous</a></span>");
@@ -755,9 +763,18 @@ var update_displayed_line = function() {
 	hiddenboard.position(current_display_line.start_fen, false);
 	for (var i = 0; i <= current_display_move; ++i) {
 		var move = current_display_line.uci_pv[i];
-		move = move.substr(0, 2) + "-" + move.substr(2, 4);
+		var promo = move.substr(4, 1);
+		move = move.substr(0, 2) + "-" + move.substr(2, 2);
 		hiddenboard.move(move, false);
 
+		// Do promotion if needed.
+		if (promo != "") {
+			var pos = hiddenboard.position();
+			var target = move.substr(3, 2);
+			pos[target] = pos[target].substr(0, 1) + promo.toUpperCase();
+			hiddenboard.position(pos, false);
+		}
+
 		// chessboard.js does not automatically move the rook on castling
 		// (issue #51; marked as won't fix), so update it ourselves.
 		if (move == "e1-g1" && hiddenboard.position().g1 == "wK") {  // white O-O
@@ -770,6 +787,10 @@ var update_displayed_line = function() {
 			hiddenboard.move("a8-d8", false);
 		}
 	}
+
+	highlighted_move = $("#automove" + current_display_line.line_number + "-" + current_display_move);
+	highlighted_move.addClass('highlight'); 
+
 	board.position(hiddenboard.position());
 }