From 71ef412d1b8832d03cad472b8e908a9ee06a43c3 Mon Sep 17 00:00:00 2001 From: Gusted Date: Mon, 11 Jan 2021 09:03:40 +0100 Subject: [PATCH] Fix order of Functions --- assets/js/main.js | 39 +++++++++++++++++++-------------------- 1 file changed, 19 insertions(+), 20 deletions(-) diff --git a/assets/js/main.js b/assets/js/main.js index 9647dc0f..e50e1669 100644 --- a/assets/js/main.js +++ b/assets/js/main.js @@ -5,11 +5,11 @@ document.querySelectorAll(".onclick-select").forEach((element) => { // Navbar dropdowns const navSections = document.querySelectorAll(".nav-details"); -const navSectionsToggle = () => { +const navSectionsToggle = (event) => { // When opening next dropdown, hide previous - if (this.open) { + if (event.target.open) { navSections.forEach((navSection) => { - if (navSection != this && navSection.open) { + if (navSection != event.target && navSection.open) { navSection.open = !open; } }); @@ -28,15 +28,14 @@ const navSectionsClose = (event) => { }); } - -navSections.forEach(navSection => { - navSection.addEventListener("toggle", navSectionsToggle); -}); -document.addEventListener("click", navSectionsClose); - -// Dark/Light color scheme switch button -document.querySelector("#nav-switch-theme").style.display = "inline"; -document.querySelector("#nav-switch-theme").addEventListener("click", changeColorScheme); +// Fix images in dark theme +function fixThemeImages() { + document.querySelectorAll('[data-theme-src]').forEach((image) => { + const tempSrc = image.src; + image.src = image.getAttribute("data-theme-src"); + image.setAttribute("data-theme-src", tempSrc); + }); +} const changeColorScheme = () => { // Use whatever users want @@ -76,15 +75,15 @@ const changeColorScheme = () => { fixThemeImages(); } +navSections.forEach(navSection => { + navSection.addEventListener("toggle", navSectionsToggle); +}); +document.addEventListener("click", navSectionsClose); + +// Dark/Light color scheme switch button +document.querySelector("#nav-switch-theme").style.display = "inline"; +document.querySelector("#nav-switch-theme").addEventListener("click", changeColorScheme); -// Fix images in dark theme -function fixThemeImages() { - document.querySelectorAll('[data-theme-src]').forEach((image) => { - const tempSrc = image.src; - image.src = image.getAttribute("data-theme-src"); - image.setAttribute("data-theme-src", tempSrc); - }); -} if (localStorage.getItem("colorScheme") === "dark" || window.matchMedia("(prefers-color-scheme: dark)").matches ^ localStorage.getItem("colorScheme") === "light"