Fix game in progress check

diff --git a/l10n/po/fr/trivabble.po b/l10n/po/fr/trivabble.po
index c57ae706ed76339d0ee90ad0bccab74335a1a07c..2469e0eb97c52fa44937a215041d2a6a308152aa 100644 (file)
--- a/l10n/po/fr/trivabble.po
+++ b/l10n/po/fr/trivabble.po
@@ -295,9 +295,6 @@ msgstr "joker"
 msgid  "Leave current game"
 msgstr "Quitter cette partie"
 
-msgid  "You are about to leave this game. Your letters will be put back in the bag. Are you sure?"
-msgstr "Vous allez quitter la partie. Vos lettres seront remises dans le sac. Êtes-vous sûr·e ?"
-
 msgid  "Enable first word verification"
 msgstr "Activer la vérification du premier mot"
 

diff --git a/l10n/pot/trivabble.pot b/l10n/pot/trivabble.pot
index 705f003d62947e7b10c4bbb2a0fd0dd61c0cb337..2a3d279cdae25387dfe473da234b5f03480e14aa 100644 (file)
--- a/l10n/pot/trivabble.pot
+++ b/l10n/pot/trivabble.pot
@@ -300,9 +300,6 @@ msgstr ""
 msgid  "Leave current game"
 msgstr ""
 
-msgid  "You are about to leave this game. Your letters will be put back in the bag. Are you sure?"
-msgstr ""
-
 msgid  "Enable first word verification"
 msgstr ""
 

diff --git a/public/trivabble.js b/public/trivabble.js
index 3d4afd52537cb1b00191fe995a51af7b487a29cd..dbb4d43a3668642f4d93412a52aa9a238c67d75b 100644 (file)
--- a/public/trivabble.js
+++ b/public/trivabble.js
@@ -187,6 +187,7 @@
     let scoreOf;
     let bag;
     let tileCount;
+    let nbTilesInRacks = 0;
     let boardLangSelect;
     let boardLabelSelect;
     const downloadedDictionaries = {};
@@ -208,7 +209,6 @@
     let blockMove = 0;
     let remainingLetters = 0;
     let needsRestart = false;
-    let gameInProgress = true;
     let currentTilePlayed = {};
 
     let eventSource = null;
@@ -804,7 +804,7 @@
     }
 
     function checkGameInProgress(f) {
-        if (!gameInProgress) {
+        if (!isGameInProgress()) {
             return f();
         }
 
@@ -982,7 +982,7 @@
             participantPlaceholder = null;
         }
 
-        let nbTilesInRacks = 0;
+        nbTilesInRacks = 0;
         for (let i = 0; i < players.length; i++) {
             const player = players[i];
             const playerName = players[i].player;
@@ -1127,7 +1127,10 @@
         }
 
         refreshCurrentPlayer();
-        gameInProgress = (nbTilesInRacks + remainingLetters > 0);
+    }
+
+    function isGameInProgress() {
+        return nbTilesInRacks > 0 || Boolean(board.querySelector(".tile"));
     }
 
     function handleLastPlayer(data) {
@@ -1647,8 +1650,7 @@
     }
 
     function leaveGame() {
-        myConfirm(
-            _("You are about to leave this game. Your letters will be put back in the bag. Are you sure?"),
+        checkGameInProgress(
             function () {
                 sendBackTiles();
                 sendCmds([{cmd: "leaveGame"}]);