#457 #456 minor issues with navigation if not logged int + if wordpre…

…ss is down
FAForever · Nov 12, 2023 · 65936e0 · 65936e0
1 parent dcde321
commit 65936e0
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 40 deletions.
diff --git a/public/js/app/navigation.js b/public/js/app/navigation.js
@@ -15,20 +15,23 @@ document.addEventListener("DOMContentLoaded", () => {
     //When you mouseover/click, menu appears
     navList[i].addEventListener("mouseout", () => {
       stillHere = 1;
-      navAbsolute[i].classList.remove("navAbsoluteActive");
-      setTimeout(() => {
-        if (stillHere === 1) {
-          navAbsolute.forEach(list => list.style.opacity = "0%");
-        }
-      }, 0);
-
+      if (navAbsolute[i]) {
+        navAbsolute[i].classList.remove("navAbsoluteActive");
+        setTimeout(() => {
+          if (stillHere === 1) {
+            navAbsolute.forEach(list => list.style.opacity = "0%");
+          }
+        }, 0);
+      }
     });
     navList[i].addEventListener("mouseover", () => {
       stillHere = 0;
-      navAbsolute[i].classList.add("navAbsoluteActive");
-      setTimeout(() => {
-        navAbsolute[i].style.opacity = "100%";
-      }, 10);
+      if (navAbsolute[i]) {
+        navAbsolute[i].classList.add("navAbsoluteActive");
+        setTimeout(() => {
+          navAbsolute[i].style.opacity = "100%";
+        }, 10);
+      }
     });
     //when you mouseout/leave, menu dissapears
   }
@@ -100,36 +103,31 @@ document.addEventListener("DOMContentLoaded", () => {
 
 
   let loginList = document.getElementById("loginList");
-  let loginAbsolute = document.getElementById("loginAbsolute");
-  let stillHovering = 0;
-
 
-  //when you mouse is over the login, it should appear
-  loginList.addEventListener("mouseover", () => {
-    stillHovering = 0;
-
-    setTimeout(() => {
-      loginAbsolute.style.display = "block";
-      //console.log('timeout done');
-    }, 0);
-  });
+  if (loginList) {
+    let loginAbsolute = document.getElementById("loginAbsolute");
+    let stillHovering = 0;
+    //when you mouse is over the login, it should appear
+    loginList.addEventListener("mouseover", () => {
+      stillHovering = 0;
+
+      setTimeout(() => {
+        loginAbsolute.style.display = "block";
+        //console.log('timeout done');
+      }, 0);
+    });
     //When you mouseover/click, menu appears
     //when you mouseout/leave, menu dissapears
     loginList.addEventListener("mouseout", () => {
       stillHovering = 1;
-
       setTimeout(() => {
         if (stillHovering === 1) {
           loginAbsolute.style.display = "none";
         }
       }, 0);
 
     });
-
-
-
-
-
+  }
 
   //function to make highligthed text change colors/pulsate (it goes from white to gold and viceversa)
   let highlightText = document.querySelectorAll(".highlightText");
@@ -151,15 +149,18 @@ document.addEventListener("DOMContentLoaded", () => {
 
 });
 
-let pages = htmlElement.split(',');
-if (pages[0] === '/all') {
-  document.getElementById('flashMessageContainer').style.display = 'block';
-} else {
-  pages.forEach(route => {
+if (typeof htmlElement !== 'undefined') {
+  let pages = htmlElement.split(',');
+  if (pages[0] === '/all') {
+    document.getElementById('flashMessageContainer').style.display = 'block';
+  } else {
+    pages.forEach(route => {
 
-    if (window.location.href.includes(route) && window.innerWidth > 900) {
-      document.getElementById('flashMessageContainer').style.display = 'block';
-    }
-  });  
+      if (window.location.href.includes(route) && window.innerWidth > 900) {
+        document.getElementById('flashMessageContainer').style.display = 'block';
+      }
+    });
+  }
 }
 
+
diff --git a/templates/layouts/default.pug b/templates/layouts/default.pug
@@ -292,8 +292,10 @@ html(lang='en')
 
       //- Add scripts that are globally required by your site here.
       // This script here adss what our flash message requirements are.
-      script(type='text/javascript').
-        var htmlElement = !{JSON.stringify(flashRoutes)}
+      if flashRoutes
+        script(type='text/javascript').
+          var htmlElement = !{JSON.stringify(flashRoutes)}
+
       script(src="../../js/app/navigation.js")