From 3c1f0996a3470046cfdf48f24c2e1d9f44075e95 Mon Sep 17 00:00:00 2001 From: Bobby Wibowo Date: Fri, 2 Oct 2020 04:34:44 +0700 Subject: [PATCH] Updated dashboard.js It's a bit eh, but it works. This should finally fix active sidebar menus getting deactivated in certain conditions and all that kinda jazz. --- src/js/dashboard.js | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/js/dashboard.js b/src/js/dashboard.js index 743640b..57853ae 100644 --- a/src/js/dashboard.js +++ b/src/js/dashboard.js @@ -295,12 +295,14 @@ page.updateTrigger = (trigger, newState) => { if (newState === 'loading') { trigger.classList.add('is-loading') } else if (newState === 'active') { - if (!trigger.id.startsWith('item')) - return - for (let i = 0; i < page.menus.length; i++) - page.menus[i].classList.remove('is-active') - trigger.classList.remove('is-loading') - trigger.classList.add('is-active') + if (trigger.parentNode.tagName === 'LI' && !trigger.className.includes('pagination-link')) { + for (let i = 0; i < page.menus.length; i++) + page.menus[i].classList.remove('is-active') + trigger.classList.remove('is-loading') + trigger.classList.add('is-active') + } else { + trigger.classList.remove('is-loading') + } } else { trigger.classList.remove('is-loading') trigger.classList.remove('is-active')