X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=www%2Fjs%2Fremoteglot.js;h=b0c89cb750a8e179a0e87b03132da53fec7db000;hb=cf799b6a08f1986df68e7921aab5fe63ff763b7b;hp=59d94129097f8bd3c882ad2cdf024d57d03ac359;hpb=730a492638bd85b0c319cef330c626292ef83b59;p=remoteglot diff --git a/www/js/remoteglot.js b/www/js/remoteglot.js index 59d9412..b0c89cb 100644 --- a/www/js/remoteglot.js +++ b/www/js/remoteglot.js @@ -839,6 +839,8 @@ let update_refutation_lines = function() { tbl.replaceChildren(); if (display_lines.length < 2) { + // Update the move highlight, as we've rewritten all the HTML. + update_move_highlight(); return; } @@ -897,8 +899,11 @@ let update_refutation_lines = function() { continue; } - let move = "" + line['move'] + ""; - move_td.innerHTML = move; + let move_link = document.createElement("a"); + move_link.classList.add("move"); + move_link.setAttribute("href", "javascript:show_line(" + display_lines.length + ", 0)"); + move_link.textContent = line['move']; + move_td.appendChild(move_link); let score_td = document.createElement("td"); tr.appendChild(score_td); @@ -1223,6 +1228,9 @@ let update_board = function() { return; } + if (clock_timer !== null) { + clearTimeout(clock_timer); + } update_clock(); // The score. @@ -1419,16 +1427,16 @@ let update_sparkline = function(data) { let color; if (scores[i] === 0) { color = [0.5, 0.5, 0.5]; - rect.setAttributeNS(null, 'y', base_y - 1); + rect.setAttributeNS(null, 'y', base_y); rect.setAttributeNS(null, 'height', 1); } else if (scores[i] > 0) { color = [0.2, 0.4, 0.8]; rect.setAttributeNS(null, 'y', base_y - extent); - rect.setAttributeNS(null, 'height', extent); + rect.setAttributeNS(null, 'height', extent + 1); } else { color = [1.0, 0.267, 0.267]; rect.setAttributeNS(null, 'y', base_y); - rect.setAttributeNS(null, 'height', -extent); + rect.setAttributeNS(null, 'height', -extent + 1); } let hlcolor = [color[0], color[1], color[2]]; if (scores[i] !== 0) { @@ -1444,7 +1452,7 @@ let update_sparkline = function(data) { rect.addEventListener('mouseenter', (e) => draw_hover(e, hlcolor, tooltip)); rect.addEventListener('mousemove', (e) => draw_hover(e, hlcolor, tooltip)); rect.addEventListener('mouseleave', (e) => hide_hover(e, color)); - rect.addEventListener('click', (e) => show_line(0, i + first_move_num - 1)); + rect.addEventListener('click', (e) => { hide_hover(e, color); show_line(0, i + first_move_num - 1) }); scorespark.appendChild(rect); } } @@ -1494,7 +1502,7 @@ let update_num_viewers = function(num_viewers) { } let update_clock = function() { - clearTimeout(clock_timer); + clock_timer = null; let data = displayed_analysis_data || current_analysis_data; if (!data) return; @@ -1830,20 +1838,38 @@ let update_imbalance = function(fen) { } } } - let white_imbalance = ''; - let black_imbalance = ''; + let white_imbalance = document.getElementById('whiteimbalance'); + let black_imbalance = document.getElementById('blackimbalance'); + white_imbalance.textContent = ''; + black_imbalance.textContent = ''; for (let piece in imbalance) { for (let i = 0; i < imbalance[piece]; ++i) { - white_imbalance += ''; - white_imbalance += ''; + let i1 = document.createElement('img'); + i1.src = svg_pieces['w' + piece.toUpperCase()]; + i1.setAttribute('alt', piece.toUpperCase()); + i1.classList.add('imbalance-piece'); + white_imbalance.appendChild(i1); + + let i2 = document.createElement('img'); + i2.src = svg_pieces['b' + piece.toUpperCase()]; + i2.setAttribute('alt', piece.toUpperCase()); + i2.classList.add('imbalance-inverted-piece'); + white_imbalance.appendChild(i2); } for (let i = 0; i < -imbalance[piece]; ++i) { - black_imbalance += ''; - black_imbalance += ''; + let i1 = document.createElement('img'); + i1.src = svg_pieces['b' + piece.toUpperCase()]; + i1.setAttribute('alt', piece.toUpperCase()); + i1.classList.add('imbalance-piece'); + black_imbalance.appendChild(i1); + + let i2 = document.createElement('img'); + i2.src = svg_pieces['w' + piece.toUpperCase()]; + i2.setAttribute('alt', piece.toUpperCase()); + i2.classList.add('imbalance-inverted-piece'); + black_imbalance.appendChild(i2); } } - document.getElementById('whiteimbalance').innerHTML = white_imbalance; - document.getElementById('blackimbalance').innerHTML = black_imbalance; } /** Mark the currently selected move in red. @@ -1996,7 +2022,11 @@ let explore_hash = function(fen) { fetch(backend_hash_url + "?fen=" + fen, { signal }) .then((response) => response.json()) .then((data) => { show_explore_hash_results(data, fen); }) - .catch((err) => {}); + .catch((err) => { + // Truncate the lines, since we already cleared the display. + display_lines = [ display_lines[0], display_lines[1] ]; + update_move_highlight(); + }); } /** Process the JSON response from a hash probe request. @@ -2033,12 +2063,12 @@ let onDragStart = function(source, piece, position, orientation) { } let mousedownSquare = function(e) { - if (!e.target || !e.target.matches('.square-55d63')) { + if (!e.target || !e.target.closest('.square-55d63')) { return; } reverse_dragging_from = null; - let square = e.target.getAttribute('data-square'); + let square = e.target.closest('.square-55d63').getAttribute('data-square'); let pseudogame = new Chess(display_fen); if (pseudogame.game_over() === true) { @@ -2063,13 +2093,13 @@ let mousedownSquare = function(e) { } let mouseupSquare = function(e) { - if (!e.target || !e.target.matches('.square-55d63')) { + if (!e.target || !e.target.closest('.square-55d63')) { return; } if (reverse_dragging_from === null) { return; } - let source = e.target.getAttribute('data-square'); + let source = e.target.closest('.square-55d63').getAttribute('data-square'); let target = reverse_dragging_from; reverse_dragging_from = null; if (onDrop(source, target) !== 'snapback') { @@ -2178,6 +2208,8 @@ let onSnapEnd = function(source, target) { promotion: 'q' // NOTE: always promote to a queen for example simplicity }); + // Move ahead on the line we're on -- this includes history if we've + // gone backwards. if (current_display_line && current_display_move < current_display_line.pv.length - 1 && current_display_line.pv[current_display_move + 1] === move.san) { @@ -2187,8 +2219,9 @@ let onSnapEnd = function(source, target) { // Walk down the displayed lines until we find one that starts with // this move, then select that. Note that this gives us a good priority - // order (history first, then PV, then multi-PV lines). - for (let i = 0; i < display_lines.length; ++i) { + // order (PV, then multi-PV lines; history was already dealt with above, + // as it's the only line that originates backwards). + for (let i = 1; i < display_lines.length; ++i) { if (i == 1 && current_display_line) { // Do not choose PV if not on it. continue;