make nav stickier

votersforanimalrights · Feb 17, 2018 · 077a29d · 077a29d
1 parent 74b4be9
commit 077a29d
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 17 deletions.
diff --git a/assets/js/main.js b/assets/js/main.js
diff --git a/public/js/main-5b9f95eed1.js b/public/js/main-5b9f95eed1.js
diff --git a/public/js/main-db73d5602d.js b/public/js/main-db73d5602d.js
diff --git a/rev-manifest.json b/rev-manifest.json
@@ -1,6 +1,6 @@
 {
   "css/styles.css": "css/styles-9bee4bb329.css",
   "css/styles.min.css": "css/styles-ee6752873b.min.css",
-  "js/main.js": "js/main-db73d5602d.js",
+  "js/main.js": "js/main-5b9f95eed1.js",
   "sprites/sprite.png": "sprites/sprite-bbe031af38.png"
 }
diff --git a/wp-content/themes/eshv/js/main.js b/wp-content/themes/eshv/js/main.js
@@ -1,5 +1,4 @@
 const b = document.body;
-const masthead = document.getElementById('masthead');
 const subnav = document.getElementById('subnav');
 const mainNav = document.getElementById('header-nav');
 const mainNavLinks = mainNav.getElementsByTagName('a');
@@ -12,25 +11,24 @@ const inlineTriggerModal = document.querySelectorAll('.trigger-modal');
 
 window.addEventListener('scroll', () => {
   if (window.scrollY >= 120) {
+    if (mainNav.getElementsByClassName('hovered').length > 0) {
+      for (let i = 0; i < mainNavLinks.length; i += 1) {
+        mainNavLinks[i].classList.remove('hovered');
+      }
+      for (let j = 0; j < subnavLinks.length; j += 1) {
+        if (subnavLinks[j].classList.contains('active')) {
+          subnavLinks[j].style.display = 'block';
+        } else {
+          subnavLinks[j].style.display = 'none';
+        }
+      }
+    }
     subnav.classList.add('sticky-nav');
   } else {
     subnav.classList.remove('sticky-nav');
   }
 });
 
-masthead.addEventListener('mouseleave', () => {
-  for (let i = 0; i < mainNavLinks.length; i += 1) {
-    mainNavLinks[i].classList.remove('hovered');
-  }
-  for (let j = 0; j < subnavLinks.length; j += 1) {
-    if (subnavLinks[j].classList.contains('active')) {
-      subnavLinks[j].style.display = 'block';
-    } else {
-      subnavLinks[j].style.display = 'none';
-    }
-  }
-});
-
 const toggleHovered = link => {
   for (let i = 0; i < mainNavLinks.length; i += 1) {
     mainNavLinks[i].classList.remove('hovered');