Merge pull request #327 from devgeniem/fix/mobile-nav

Fix/mobile-nav: Fix hamburger menu toggle, attempt #2
devgeniem · Dec 22, 2021 · 39442cd · 39442cd
2 parents caecdb8 + 9ac0daa
commit 39442cd
Show file tree

Hide file tree

Showing 5 changed files with 609 additions and 292 deletions.
diff --git a/CHANGELOG.MD b/CHANGELOG.MD
@@ -7,6 +7,11 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+### Changed
+
+- Revert "Downgrade image-webpack-loader"
+- fix/mobile-nav: Fix issue where user was unable to close fly out navigation in mobile
+
 ## [1.31.2]
 
 ### Changed

diff --git a/assets/scripts/header.js b/assets/scripts/header.js
@@ -61,25 +61,11 @@ export default class Header {
      */
     docReady() {
         $( '.site-header-notice__close' ).on( 'click', this.onNoticeClose.bind( this ) );
+        $( '.fly-out-nav__close' ).on( 'click', this.closeFlyOutMenu.bind( this ) );
         $( '.fly-out-nav .js-scroll-children' ).on( 'click', this.closeFlyOutMenu.bind( this ) );
 
-        const modalTrigger = $( '.fly-out-nav__trigger' );
-
         MicroModal.init( {
             disableScroll: true,
-            onShow: () => {
-                const isDisabled = modalTrigger.attr( 'disabled' );
-
-                modalTrigger.attr( 'disabled', ! isDisabled );
-                this.onFlyOutMenuOpen.bind( this );
-            },
-            onClose: () => {
-                const isDisabled = modalTrigger.attr( 'disabled' );
-
-                window.setTimeout( () => {
-                    modalTrigger.attr( 'disabled', ! isDisabled );
-                }, 25 );
-            },
         } );
 
         this.maybeShowGeneralNotification();