Skip to content
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

Jump to bottom

Fix incorrect page state on successive mobile menu toggling #10476

Merged
merged 2 commits into from
Aug 21, 2023
Merged

Fix incorrect page state on successive mobile menu toggling #10476

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d368571
Fix incorrect page state on successive mobile menu toggling
nanaya Aug 18, 2023
7727b2e
Merge branch 'master' into mobile-menu-blackout
notbakaneko Aug 21, 2023
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
15 changes: 10 additions & 5 deletions resources/js/core-legacy/nav2.coffee
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,13 +46,18 @@ export default class Nav2
@clickMenu.show('mobile-nav')
Timeout.set 0, => $(@clickMenu.menu('mobile-menu')).finish().slideDown(150)

if tree.indexOf('mobile-menu') == -1
if previousTree.indexOf('mobile-menu') != -1
blackoutHide()
Timeout.set 0, => $(@clickMenu.menu('mobile-menu')).finish().slideUp(150, => document.body.classList.remove('js-nav2--active'))
else
@showingMobileNav = tree.indexOf('mobile-menu') != -1

if @showingMobileNav
document.body.classList.add('js-nav2--active')
blackoutShow()
else if previousTree.indexOf('mobile-menu') != -1
blackoutHide()
Timeout.set 0, =>
$(@clickMenu.menu('mobile-menu')).finish().slideUp 150, =>
# use actual state instead of always removing the class in case
# the menu is shown again right after it's closed
document.body.classList.toggle('js-nav2--active', @showingMobileNav)


centerPopup: (popup, reference) ->
Expand Down