diff --git a/app.js b/app.js index 6e8c968..a2cb187 100644 --- a/app.js +++ b/app.js @@ -94,12 +94,19 @@ io.on("connection", (socket) => { teamName: teamName, buzzerId: buzzerId } + console.log(userInfo); + io.emit("userInfoToClient", userInfo); + }); + + //used by the host when they refresh the page. + socket.on("refreshUserInfo", () => { io.emit("userInfoToClient", userInfo); }); socket.on("unregisterUsers", () => { userInfo = new Object(); io.emit("userInfoToClient", userInfo); + io.emit("reconnectUsers"); }); socket.on("objectionToServer", (userName) => { diff --git a/browserFunctions.js b/browserFunctions.js index 2f94aba..b11be9a 100644 --- a/browserFunctions.js +++ b/browserFunctions.js @@ -1,6 +1,7 @@ function userInfoToClient(userInfo) { for (const user in userInfo) { - const userId = user.replaceAll(" ","_"); + re = new RegExp("\\W","g"); + const userId = user.replaceAll(re,"_"); if ($("#userListPanel").find("#"+userId).length >= 1) { //update buzzer icon of existing user $("#userListPanel").find("#"+userId).find("img").attr("data-buzzerId",userInfo[user].buzzerId); diff --git a/pages/home.html b/pages/home.html index 31769dc..77027bb 100644 --- a/pages/home.html +++ b/pages/home.html @@ -1,7 +1,7 @@ - No, you do not need to mute this site anymore. + You may now put weird characters in your name. @@ -10,6 +10,8 @@ $(document).ready(function() { var socket = io(); + socket.emit("refreshUserInfo"); + socket.on("userInfoToClient", (userInfo) => { userInfoToClient(userInfo); }); @@ -46,6 +48,7 @@ $("#unregisterUsers").click(function() { socket.emit("unregisterUsers"); + location.reload(); }); socket.on("objectionToClient", (userName) => { @@ -80,7 +83,7 @@


- +
diff --git a/pages/play.html b/pages/play.html index 2ccc877..e4f4d25 100644 --- a/pages/play.html +++ b/pages/play.html @@ -1,7 +1,7 @@ - No, you do not need to mute this site anymore. + No, you do not need to mute this site anymore. (yes, even on firefox) @@ -150,6 +150,10 @@ userInfoToClient(userInfo); }); + socket.on("reconnectUsers", () => { + location.reload(); + }); + socket.on("gameStateToClient", (currentTeam, currentScore) => { gameStateToClient(currentTeam, currentScore); });