Skip to content

Commit 6a4ca3d

Browse files
authored
resolves #90 fit nav in desktop view for page without nav menu (PR #91)
1 parent 8faf26a commit 6a4ca3d

File tree

1 file changed

+9
-7
lines changed

1 file changed

+9
-7
lines changed

src/js/01-nav.js

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,16 @@
99
navToggle.addEventListener('click', showNav)
1010
navContainer.addEventListener('click', trapEvent)
1111

12-
var menuPanel = navContainer.querySelector('[data-panel=menu]')
13-
if (!menuPanel) return
1412
var nav = navContainer.querySelector('.nav')
13+
var menuPanel = nav.querySelector('[data-panel=menu]')
1514
var navBounds = { encroachingElement: document.querySelector('footer.footer') }
16-
1715
var currentPageItem
16+
17+
window.addEventListener('load', fitNavInit)
18+
window.addEventListener('resize', fitNavInit)
19+
20+
if (!menuPanel) return fitNavInit({})
21+
1822
if (menuPanel.classList.contains('is-loading')) {
1923
if ((currentPageItem = findItemForHash() || menuPanel.querySelector('.is-current-url'))) {
2024
activateCurrentPath(currentPageItem)
@@ -33,8 +37,6 @@
3337
}
3438

3539
fitNavInit({})
36-
window.addEventListener('load', fitNavInit)
37-
window.addEventListener('resize', fitNavInit)
3840

3941
menuPanel.querySelector('.nav-menu-toggle').addEventListener('click', function () {
4042
var collapse = !this.classList.toggle('is-active')
@@ -176,11 +178,11 @@
176178
}
177179

178180
function fitNav () {
179-
var scrollDatum = menuPanel.scrollTop + menuPanel.offsetHeight
181+
var scrollDatum = menuPanel && (menuPanel.scrollTop + menuPanel.offsetHeight)
180182
var occupiedHeight = navBounds.availableHeight - navBounds.encroachingElement.getBoundingClientRect().top
181183
nav.style.height = occupiedHeight > 0
182184
? Math.max(0, Math.round(navBounds.preferredHeight - occupiedHeight)) + 'px'
183185
: ''
184-
menuPanel.scrollTop = scrollDatum - menuPanel.offsetHeight
186+
if (menuPanel) menuPanel.scrollTop = scrollDatum - menuPanel.offsetHeight
185187
}
186188
})()

0 commit comments

Comments
 (0)