X-Git-Url: https://git.sesse.net/?p=remoteglot;a=blobdiff_plain;f=www%2Fjs%2Fremoteglot.js;h=52e4c4a72f528827ee4b9c1018060bb8fedc5642;hp=d75b3fca18b980a9dec369699728747d1614699d;hb=739a5a75ca7f10bb9759578acea288d97aa4a0a9;hpb=944e74aaa3c5b3038d16d8be1461be6f6f33a4b4 diff --git a/www/js/remoteglot.js b/www/js/remoteglot.js index d75b3fc..52e4c4a 100644 --- a/www/js/remoteglot.js +++ b/www/js/remoteglot.js @@ -3,9 +3,6 @@ /** @type {window.ChessBoard} @private */ var board = null; -/** @type {window.ChessBoard} @private */ -var hiddenboard = null; - /** @type {Array.<{ * from_col: number, * from_row: number, @@ -100,12 +97,15 @@ var get_unique = function() { var request_update = function() { $.ajax({ - url: "http://analysis.sesse.net/analysis.pl?ims=" + ims + "&unique=" + unique - //url: "http://analysis.sesse.net:5000/analysis.pl?ims=" + ims + "&unique=" + unique + url: "/analysis.pl?ims=" + ims + "&unique=" + unique }).done(function(data, textstatus, xhr) { ims = xhr.getResponseHeader('X-Remoteglot-Last-Modified'); var num_viewers = xhr.getResponseHeader('X-Remoteglot-Num-Viewers'); - update_board(data, num_viewers); + update_board(data); + update_num_viewers(num_viewers); + + // Next update. + setTimeout(function() { request_update(); }, 100); }).fail(function() { // Wait ten seconds, then try again. setTimeout(function() { request_update(); }, 10000); @@ -402,13 +402,19 @@ var thousands = function(x) { /** * @param {!string} fen * @param {Array.} uci_pv - * @param {Array.} pretty_pv * @param {number} move_num * @param {!string} toplay * @param {number=} opt_limit * @param {boolean=} opt_showlast */ -var add_pv = function(fen, uci_pv, pretty_pv, move_num, toplay, opt_limit, opt_showlast) { +var add_pv = function(fen, uci_pv, move_num, toplay, opt_limit, opt_showlast) { + var hiddenboard = new Chess(); + hiddenboard.load(fen); + for (var i = 0; i < uci_pv.length; ++i) { + hiddenboard.move(ucimove_to_chessjs_move(uci_pv[i])); + } + var pretty_pv = hiddenboard.history(); + display_lines.push({ start_fen: fen, uci_pv: uci_pv, @@ -542,7 +548,7 @@ var update_refutation_lines = function() { var pv_td = document.createElement("td"); tr.appendChild(pv_td); $(pv_td).addClass("pv"); - $(pv_td).html(add_pv(fen, line['pv_uci'], line['pv_pretty'], move_num, toplay, 10)); + $(pv_td).html(add_pv(fen, line['pv_uci'], move_num, toplay, 10)); tbl.append(tr); } @@ -559,9 +565,8 @@ var update_refutation_lines = function() { /** * @param {Object} data - * @param {number} num_viewers */ -var update_board = function(data, num_viewers) { +var update_board = function(data) { display_lines = []; // The headline. @@ -588,14 +593,6 @@ var update_board = function(data, num_viewers) { $("#headline").text(headline); - if (num_viewers === null) { - $("#numviewers").text(""); - } else if (num_viewers == 1) { - $("#numviewers").text("You are the only current viewer"); - } else { - $("#numviewers").text(num_viewers + " current viewers"); - } - // The engine id. if (data['id'] && data['id']['name'] !== null) { $("#engineid").text(data['id']['name']); @@ -655,14 +652,14 @@ var update_board = function(data, num_viewers) { // Print the history. if (data['position']['history']) { - add_pv('start', data['position']['history'], data['position']['pretty_history'], 1, 'W', 8, true); + add_pv('start', data['position']['history'], 1, 'W', 8, true); } else { display_lines.push(null); } update_history(); // Print the PV. - $("#pv").html(add_pv(data['position']['fen'], data['pv_uci'], data['pv_pretty'], data['position']['move_num'], data['position']['toplay'])); + $("#pv").html(add_pv(data['position']['fen'], data['pv_uci'], data['position']['move_num'], data['position']['toplay'])); // Update the PV arrow. clear_arrows(); @@ -722,9 +719,19 @@ var update_board = function(data, num_viewers) { toplay = data['position']['toplay']; refutation_lines = data['refutation_lines']; update_refutation_lines(); +} - // Next update. - setTimeout(function() { request_update(); }, 100); +/** + * @param {number} num_viewers + */ +var update_num_viewers = function(num_viewers) { + if (num_viewers === null) { + $("#numviewers").text(""); + } else if (num_viewers == 1) { + $("#numviewers").text("You are the only current viewer"); + } else { + $("#numviewers").text(num_viewers + " current viewers"); + } } /** @@ -804,52 +811,28 @@ var update_displayed_line = function() { $("#nextmove").html("Next"); } - hiddenboard.position(current_display_line.start_fen, false); + var hiddenboard = new Chess(); + hiddenboard.load(current_display_line.start_fen); for (var i = 0; i <= current_display_move; ++i) { - var pos = hiddenboard.position(); - var move = current_display_line.uci_pv[i]; - var source = move.substr(0, 2); - var target = move.substr(2, 2); - var promo = move.substr(4, 1); - - // Check if we need to do en passant. - var piece = pos[source]; - if (piece == "wP" || piece == "bP") { - if (source.substr(0, 1) != target.substr(0, 1) && - pos[target] === undefined) { - var ep_square = target.substr(0, 1) + source.substr(1, 1); - delete pos[ep_square]; - hiddenboard.position(pos, false); - } - } - - move = source + "-" + target; - hiddenboard.move(move, false); - pos = hiddenboard.position(); - - // Do promotion if needed. - if (promo != "") { - 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 - hiddenboard.move("h1-f1", false); - } else if (move == "e1-c1" && hiddenboard.position().c1 == "wK") { // white O-O-O - hiddenboard.move("a1-d1", false); - } else if (move == "e8-g8" && hiddenboard.position().g8 == "bK") { // black O-O - hiddenboard.move("h8-f8", false); - } else if (move == "e8-c8" && hiddenboard.position().c8 == "bK") { // black O-O-O - hiddenboard.move("a8-d8", false); - } + hiddenboard.move(ucimove_to_chessjs_move(current_display_line.uci_pv[i])); } highlighted_move = $("#automove" + current_display_line.line_number + "-" + current_display_move); highlighted_move.addClass('highlight'); - board.position(hiddenboard.position()); + board.position(hiddenboard.fen()); +} + +var ucimove_to_chessjs_move = function(move) { + var source = move.substr(0, 2); + var target = move.substr(2, 2); + var promo = move.substr(4, 1); + + if (promo === '') { + return { from: source, to: target }; + } else { + return { from: source, to: target, promotion: promo }; + } } var init = function() { @@ -857,7 +840,6 @@ var init = function() { // Create board. board = new window.ChessBoard('board', 'start'); - hiddenboard = new window.ChessBoard('hiddenboard', 'start'); request_update(); $(window).resize(function() {