From c75b19630d7cd9fb3284509f138c2a987b327523 Mon Sep 17 00:00:00 2001 From: Henry Hiles Date: Fri, 3 Jun 2022 14:50:42 -0400 Subject: [PATCH] Some small fixes --- .gitignore | 1 + public/scripts/goToRoom.js | 8 +++++--- public/scripts/login.js | 22 ++++++++++++++-------- public/scripts/video.js | 2 -- views/index.ejs | 8 ++++---- views/room.ejs | 8 ++++---- 6 files changed, 28 insertions(+), 21 deletions(-) diff --git a/.gitignore b/.gitignore index b512c09..074ab52 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ +package-lock.json node_modules \ No newline at end of file diff --git a/public/scripts/goToRoom.js b/public/scripts/goToRoom.js index a842b2c..704524c 100644 --- a/public/scripts/goToRoom.js +++ b/public/scripts/goToRoom.js @@ -4,10 +4,12 @@ import { type } from "./utils.js" const input = document.querySelector("#go-input") input.addEventListener("keydown", (event) => { - if (event.code == "Space") { + if (event.keyCode == "32") { event.preventDefault() - type("-") - } else if (!/^[-a-z0-9]+$/i.test(event.key)) event.preventDefault() + return type("-") + } + if (event.keyCode === 13) return (location.href = input.value) + if (!/^[-a-z0-9]+$/i.test(event.key)) event.preventDefault() }) const setHref = () => diff --git a/public/scripts/login.js b/public/scripts/login.js index a32df5e..0d3d89d 100644 --- a/public/scripts/login.js +++ b/public/scripts/login.js @@ -13,11 +13,17 @@ const yourName = localStorage.getItem("name") if (yourName) nameDisplay.innerText = yourName else login.classList.remove("done") -if (nameButton) - nameButton.addEventListener("click", () => { - if (!nameInput.value) return (nameInput.required = true) - document.querySelector("#login").classList.add("done") - localStorage.setItem("name", nameInput.value) - nameDisplay.innerText = nameInput.value - socket.emit("name-change", nameInput.value) - }) +const validate = () => { + if (!nameInput.value) return (nameInput.required = true) + document.querySelector("#login").classList.add("done") + localStorage.setItem("name", nameInput.value) + nameDisplay.innerText = nameInput.value + socket.emit("name-change", nameInput.value) +} + +if (nameButton) nameButton.addEventListener("click", validate) +if (nameInput) + nameInput.addEventListener( + "keydown", + (event) => event.keyCode == "13" && validate() + ) diff --git a/public/scripts/video.js b/public/scripts/video.js index 508a482..f10badd 100644 --- a/public/scripts/video.js +++ b/public/scripts/video.js @@ -36,8 +36,6 @@ myPeer.on("open", async (id) => { ) return showNoVideoPrompt() - console.log(error.name) - throw error } diff --git a/views/index.ejs b/views/index.ejs index e9af0ad..857a0ea 100644 --- a/views/index.ejs +++ b/views/index.ejs @@ -18,14 +18,14 @@ diff --git a/views/room.ejs b/views/room.ejs index 134dccb..75da78f 100644 --- a/views/room.ejs +++ b/views/room.ejs @@ -61,14 +61,14 @@