Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 27 additions & 20 deletions src/assets/js/game.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,13 @@ if (chatIsOn) {
const content = messageInput.value;
const username = document.getElementById('headerUsername').textContent;

if (content.trim() === '') {
return;
}

chatConnection.send(JSON.stringify({
author: username,
content: content,
content: content.trim(),
game: gameCode
}));

Expand Down Expand Up @@ -265,27 +269,30 @@ function updatePlayers(data) {
});
}

gameConnection.onmessage = function (e) {
const data = JSON.parse(e.data);
let playerDisplayed = document.getElementById("players") !== null;
if (playerDisplayed) {
gameConnection.onmessage = function (e) {
const data = JSON.parse(e.data);

let parsed;
if (typeof data.content === 'string') {
parsed = JSON.parse(data.content);
} else if (typeof data.content === 'object') {
parsed = data.content; // Déjà parsé
} else {
return "Data is not a string or an object";
}
let parsed;
if (typeof data.content === 'string') {
parsed = JSON.parse(data.content);
} else if (typeof data.content === 'object') {
parsed = data.content; // Déjà parsé
} else {
return "Data is not a string or an object";
}

switch (data.command) {
case 'updatePlayers':
updatePlayers(parsed);
break;
case 'gameStarted':
redirectToStartedGame();
break;
default:
console.log('Commande inconnue');
switch (data.command) {
case 'updatePlayers':
updatePlayers(parsed);
break;
case 'gameStarted':
redirectToStartedGame();
break;
default:
console.log('Commande inconnue');
}
}
}

Expand Down