From cb045696938df15788755bac23cd514362b49962 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Rapha=C3=ABl=20Jakse?= Date: Sun, 19 Apr 2020 12:43:24 +0200 Subject: [PATCH] Correctly handle jockers and missing tiles when showing the rack --- trivabble.css | 1 + trivabble.js | 28 +++++++++++++++++++++------- 2 files changed, 22 insertions(+), 7 deletions(-) diff --git a/trivabble.css b/trivabble.css index 7feeaae..7e994e9 100644 --- a/trivabble.css +++ b/trivabble.css @@ -219,6 +219,7 @@ button:hover { width: 1.5em; height: 1.5em; margin:2px; + vertical-align:bottom; } #chat-messages .tile-letter { diff --git a/trivabble.js b/trivabble.js index 909422b..6adeac5 100644 --- a/trivabble.js +++ b/trivabble.js @@ -1249,18 +1249,32 @@ myConfirm( _("Are you sure you want to show your rack to everybody?"), function () { + const letters = playerLetters.map( + function (tilePlaceholer) { + return tilePlaceholer.querySelector(".tile"); + } + ).filter(function (tile) { + return tile !== null; + }); + sendCmds([{ cmd: "msg", - msg: _("Here is my rack:") + " " + playerLetters.map( - (tile) => ( - tile.textContent === "" - ? _("joker") - : tile.querySelector(".tile-letter").textContent - ) + msg: _("Here is my rack:") + " " + letters.map( + function (tile) { + return ( + tile.textContent === "" + ? _("joker") + : tile.querySelector(".tile-letter").textContent + ); + } ).join(", "), specialMsg: { type: "rack", - rack: playerLetters.map((tile) => tile.querySelector(".tile-letter").textContent) + rack: letters.map( + function (tile) { + return tile.querySelector(".tile-letter").textContent + } + ) } }]); } -- 2.30.2