From 3aada9949d51024a92a8b5c6cb70d12f9c3cac16 Mon Sep 17 00:00:00 2001
From: Jake Vanderwerf <get@jakevanderwerf.ca>
Date: Sun, 21 Dec 2025 19:59:48 +0000
Subject: [PATCH] =auth refactored via rest, referral system set up for Jane, some javascript consolidation
---
assets/js/concise/navigation.js | 27 +++++++++++++++------------
1 files changed, 15 insertions(+), 12 deletions(-)
diff --git a/assets/js/concise/navigation.js b/assets/js/concise/navigation.js
index ab1e141..fb06d10 100644
--- a/assets/js/concise/navigation.js
+++ b/assets/js/concise/navigation.js
@@ -60,12 +60,15 @@
if (this.navs.size === 0) {
return;
}
- if (this.openNav && !e.target.closest(this.openNav)) {
- this.toggleNav(false);
+ if (this.openNav && e.target.closest(`#${this.openNav}`) === null) {
+ this.toggleNav(false, this.openNav);
}
- if (!e.target.closest(... this.navIDs())) {
- return;
- }
+
+ // if (!e.target.closest(this.openNav)) {
+ // console.log('Not closest nav ids');
+ // console.log(this.navIDs());
+ // return;
+ // }
let toggle = e.target.closest('.toggle.main');
if (toggle) {
@@ -82,7 +85,6 @@
}
handleHoverOn(e) {
- console.log(e.target);
let nav = e.target.closest('nav');
if (nav) {
this.toggleNav(true, nav.id);
@@ -94,7 +96,6 @@
}
handleHoverOff(e) {
- console.log(e.target);
let nav = e.target.closest('nav');
if (nav) {
this.toggleNav(false, nav.id);
@@ -128,11 +129,13 @@
this.openNav = null;
}
document.removeEventListener('keydown', this.escapeListener);
- Array.from(nav.submenus).forEach(submenu => {
- if(submenu.classList.contains('open')) {
- this.toggleSubmenu(false, submenu);
- }
- });
+ if (!nav.nav.classList.contains('sidebar')) {
+ Array.from(nav.submenus).forEach(submenu => {
+ if(submenu.classList.contains('open')) {
+ this.toggleSubmenu(false, submenu);
+ }
+ });
+ }
}
nav.nav.ariaExpanded = on;
--
Gitblit v1.10.0