If the PV is hidden by exploration stuff, it should not be possible to inadvertedly...

[remoteglot] / www / js / remoteglot.js

diff --git a/www/js/remoteglot.js b/www/js/remoteglot.js
index 48f23b00dc15e324735a37c3b5c9a400b1982747..4e7a2efc262d73e2d6a4dac6aeb5ea11dc410a66 100644 (file)
--- 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);
@@ -1150,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.
@@ -1647,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));
@@ -1681,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;
        }
@@ -1706,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());
 }
 
 /**
@@ -1993,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];