这是indexloc提供的服务，不要输入任何密码
Skip to content

Direct url weirdness fix #20

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 8, 2025
Merged

Direct url weirdness fix #20

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
85 changes: 51 additions & 34 deletions src/lib/navtools.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ export default function Navtools() {
this.classList.toggle('bi-x');
});

// Modified navigation link handler
on('click', 'a.nav-link', function(e) {
console.log("Clicky");
e.preventDefault();
Expand All @@ -50,33 +49,33 @@ export default function Navtools() {

// Update active states
navlinks.forEach((item) => {
item.classList.remove('active')
})
this.classList.add('active')
item.classList.remove('active');
});
this.classList.add('active');

// Handle mobile menu
if (navbar.classList.contains('navbar-mobile')) {
navbar.classList.remove('navbar-mobile')
let navbarToggle = select('.mobile-nav-toggle')
navbarToggle.classList.toggle('bi-list')
navbarToggle.classList.toggle('bi-x')
navbar.classList.remove('navbar-mobile');
let navbarToggle = select('.mobile-nav-toggle');
navbarToggle.classList.toggle('bi-list');
navbarToggle.classList.toggle('bi-x');
}

// Handle header and sections
if (targetPath === '/') {
header.classList.remove('header-top')
header.classList.remove('header-top');
sections.forEach((item) => {
item.classList.remove('section-show')
})
item.classList.remove('section-show');
});
} else {
header.classList.add('header-top')
header.classList.add('header-top');

// Always use setTimeout for consistency
setTimeout(() => {
sections.forEach((item) => {
item.classList.remove('section-show')
})
const sectionId = targetPath.replace('/', '');
item.classList.remove('section-show');
});
// Get only the main section ID
const sectionId = targetPath.replace('/', '').split('/')[0];
const targetSection = select(`section#${sectionId}`);
console.log('Looking for section with ID:', sectionId);
console.log('Found section:', targetSection);
Expand All @@ -85,28 +84,46 @@ export default function Navtools() {
}
}, 350);
}
})
});


// Modified initial load handler
window.addEventListener('load', () => {
const currentPath = window.location.pathname;
if (currentPath !== '/') {
let header = select('header');
let navlinks = select('.nav-link', true);
let sections = select('section', true);

header.classList.add('header-top');

// Modified initial load handler
window.addEventListener('load', () => {
const currentPath = window.location.pathname;
if (currentPath !== '/') {
let header = select('header')
let navlinks = select('nav-link', true)

header.classList.add('header-top')

navlinks.forEach((item) => {
if (item.getAttribute('href') === currentPath) {
item.classList.add('active')
} else {
item.classList.remove('active')
}
})
// Remove section-show from all sections
sections.forEach((item) => {
item.classList.remove('section-show');
});

// Get main section ID (first part of the path)
const sectionId = currentPath.replace('/', '').split('/')[0];
const targetSection = select(`section#${sectionId}`);

console.log('Initial load - looking for section:', sectionId);

if (targetSection) {
console.log('Found section, showing:', sectionId);
targetSection.classList.add('section-show');
}
});

// Update active nav link - match only the main path
navlinks.forEach((item) => {
const navPath = item.getAttribute('href').split('/')[1]; // Get first part after /
if (navPath === sectionId) {
item.classList.add('active');
} else {
item.classList.remove('active');
}
});
}
});

/**
* Initializes testimonials slider with responsive configuration
Expand Down