From e3d095dbe5e99684f1b837c9fa3c4f0cadeb06c7 Mon Sep 17 00:00:00 2001 From: rakeshAlgo Date: Fri, 31 Jul 2020 11:49:26 +0530 Subject: [PATCH 1/2] Fix lacking issues on page load --- src/js/01-nav.js | 54 ++++++++++++++++++++++++------------------------ 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/src/js/01-nav.js b/src/js/01-nav.js index c1acb3ee..6cfd30e9 100644 --- a/src/js/01-nav.js +++ b/src/js/01-nav.js @@ -14,6 +14,7 @@ }) find(/*'.nav-toggle',*/ '.in-toggle', navMenu.element).forEach(function (toggleBtn) { + console.log(toggleBtn, 17) var navItem = findAncestorWithClass('nav-item', toggleBtn, navMenu.element) toggleBtn.addEventListener('click', toggleActive.bind(navItem)) // var dataDepth = toggleBtn.getAttribute('data-depth') @@ -150,36 +151,35 @@ var topPositon = currentPageMenu.offsetTop var leftMenu = document.querySelector('.left-sidebar-menu .nav-menu') leftMenu.scrollTop = topPositon + } + }, 100) //setTime Out end + + // show depth 0 child element + if (document.querySelector('.is-current-page')) { + var otherNavs = document.querySelectorAll('.nav-list > .nav-item[data-depth="0"]') + otherNavs.forEach(function (nav) { + var navSubMenu = Array.from(nav.querySelector('ul.nav-list').children) + // var navDataDepth = Array.from(nav.querySelector('ul.nav-list')) + navSubMenu.forEach(function (item) { + item.classList.remove('is-inactive') + }) - // show depth 0 child element - - var otherNavs = document.querySelectorAll('.nav-list > .nav-item[data-depth="0"]') - otherNavs.forEach(function (nav) { - var navSubMenu = Array.from(nav.querySelector('ul.nav-list').children) - // var navDataDepth = Array.from(nav.querySelector('ul.nav-list')) - navSubMenu.forEach(function (item) { - item.classList.remove('is-inactive') - }) - - // hide main menu for top level navigation - + // hide main menu for top level navigation - - if (nav.className.includes('is-current-page')) { - navMenuControl.style.display = 'none' - } + if (nav.className.includes('is-current-page')) { + navMenuControl.style.display = 'none' + } - // hide in second level menu - if (nav.className.includes('is-current-path')) { - otherNavs.forEach(function (navItem) { - if (!navItem.className.includes('is-current-path')) { - navItem.classList.add('is-inactive') - } - }) - } - }) - // if(otherNavs) { + // hide in second level menu + if (nav.className.includes('is-current-path')) { + otherNavs.forEach(function (navItem) { + if (!navItem.className.includes('is-current-path')) { + navItem.classList.add('is-inactive') + } + }) + } + }) + } // if condition end - // } - } - }, 100) // clearTimeout(scrollCurrentPageMenu, 20000) })() From 3562f93d7c7a6aefd771b9dd60153a5026f3ce2b Mon Sep 17 00:00:00 2001 From: rakeshAlgo Date: Fri, 31 Jul 2020 14:42:25 +0530 Subject: [PATCH 2/2] Fixed top level menu issues while click on submenu icon top level menu were hiding --- src/js/01-nav.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/js/01-nav.js b/src/js/01-nav.js index 6cfd30e9..4d06ead8 100644 --- a/src/js/01-nav.js +++ b/src/js/01-nav.js @@ -82,12 +82,12 @@ } // Toggle class function toggleActive (e) { - if (this.getAttribute('data-depth') === '1') { - var otherNavs = document.querySelectorAll('.nav-item[data-depth="0"]:not(.is-active)') - for (var i = 0; i < otherNavs.length; i++) { - otherNavs[i].classList.add('is-inactive') - } - } + // if (this.getAttribute('data-depth') === '1') { + // var otherNavs = document.querySelectorAll('.nav-item[data-depth="0"]:not(.is-active)') + // for (var i = 0; i < otherNavs.length; i++) { + // otherNavs[i].classList.add('is-inactive') + // } + // } this.classList.toggle('open') this.classList.toggle('is-active') }