From 69152e63a213ba4f52e44845875d4c07112be3f0 Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Tue, 18 Jan 2022 15:44:53 +0200 Subject: [PATCH] sfd --- files/assets/js/header.js | 8 ++-- files/assets/js/signup.js | 74 +++++++++++++++++------------------- files/templates/header.html | 2 +- files/templates/sign_up.html | 2 +- 4 files changed, 40 insertions(+), 46 deletions(-) diff --git a/files/assets/js/header.js b/files/assets/js/header.js index ad9ccc1d1..0a1baa652 100644 --- a/files/assets/js/header.js +++ b/files/assets/js/header.js @@ -4,11 +4,9 @@ function formkey() { else return null; } -document.addEventListener("DOMContentLoaded", function(){ - var tooltipTriggerList = [].slice.call(document.querySelectorAll('[data-bs-toggle="tooltip"]')); - tooltipTriggerList.map(function(element){ - return new bootstrap.Tooltip(element); - }); +var tooltipTriggerList = [].slice.call(document.querySelectorAll('[data-bs-toggle="tooltip"]')); +tooltipTriggerList.map(function(element){ + return new bootstrap.Tooltip(element); }); function post_toast(url, reload, data) { diff --git a/files/assets/js/signup.js b/files/assets/js/signup.js index baad1cd68..bee4f5693 100644 --- a/files/assets/js/signup.js +++ b/files/assets/js/signup.js @@ -1,45 +1,41 @@ -document.addEventListener("DOMContentLoaded", function () { +document.getElementById('password-register').addEventListener('input', function () { - document.getElementById('password-register').addEventListener('input', function () { + var charCount = document.getElementById("password-register").value; + var id = document.getElementById("passwordHelpRegister"); + var successID = document.getElementById("passwordHelpSuccess"); - var charCount = document.getElementById("password-register").value; - var id = document.getElementById("passwordHelpRegister"); - var successID = document.getElementById("passwordHelpSuccess"); + if (charCount.length >= 8) { + id.classList.add("d-none"); + successID.classList.remove("d-none"); + } else { + id.classList.remove("d-none"); + successID.classList.add("d-none"); + } +}); - if (charCount.length >= 8) { - id.classList.add("d-none"); - successID.classList.remove("d-none"); - } else { - id.classList.remove("d-none"); - successID.classList.add("d-none"); +document.getElementById('username-register').addEventListener('input', function () { + + const userName = document.getElementById("username-register").value; + const id = document.getElementById("usernameHelpRegister"); + + if (/[^a-zA-Z0-9_\-$]/.test(userName)) { + id.innerHTML = 'No special characters or spaces allowed.'; + } else { + id.innerHTML = 'Username is a-okay!'; + + if (userName.length < 3) { + id.innerHTML = 'Username must be at least 3 characters long.'; + } else if (userName.length > 25) { + id.innerHTML = 'Username must be 25 characters or less.'; } - }); - - document.getElementById('username-register').addEventListener('input', function () { - - const userName = document.getElementById("username-register").value; - const id = document.getElementById("usernameHelpRegister"); - - if (/[^a-zA-Z0-9_\-$]/.test(userName)) { - id.innerHTML = 'No special characters or spaces allowed.'; - } else { - id.innerHTML = 'Username is a-okay!'; - - if (userName.length < 3) { - id.innerHTML = 'Username must be at least 3 characters long.'; - } else if (userName.length > 25) { - id.innerHTML = 'Username must be 25 characters or less.'; - } - else { - fetch('/is_available/' + userName) - .then(res => res.json()) - .then(json => { - if (!json[userName]) { - id.innerHTML = 'Username already taken :('; - } - }) - } + else { + fetch('/is_available/' + userName) + .then(res => res.json()) + .then(json => { + if (!json[userName]) { + id.innerHTML = 'Username already taken :('; + } + }) } - }); - + } }); \ No newline at end of file diff --git a/files/templates/header.html b/files/templates/header.html index 359528868..54d66903e 100644 --- a/files/templates/header.html +++ b/files/templates/header.html @@ -207,7 +207,7 @@ - +