95bf9dfa by Jeff Balicki

menu fix

Signed-off-by: Jeff <jeff@gotenzing.com>
1 parent 912f0171
...@@ -108,10 +108,11 @@ function megamenu_override_default_theme($value) { ...@@ -108,10 +108,11 @@ function megamenu_override_default_theme($value) {
108 add_filter('default_option_megamenu_settings', 'megamenu_override_default_theme'); 108 add_filter('default_option_megamenu_settings', 'megamenu_override_default_theme');
109 109
110 function fixUlisting() { 110 function fixUlisting() {
111 $the_theme = wp_get_theme();
111 wp_deregister_script( 'megamenu' ); 112 wp_deregister_script( 'megamenu' );
112 wp_dequeue_script( 'megamenu' ); 113 wp_dequeue_script( 'megamenu' );
113 114
114 wp_enqueue_script( 'megamenu', get_stylesheet_directory_uri().'/js/maxmegamenu.js' ); 115 wp_enqueue_script( 'megamenu', get_stylesheet_directory_uri().'/js/maxmegamenu.js', array(), $the_theme->get( 'Version' ), true );
115 116
116 } 117 }
117 add_action( 'wp_enqueue_scripts', 'fixUlisting', 100 ); 118 add_action( 'wp_enqueue_scripts', 'fixUlisting', 100 );
......
...@@ -20665,7 +20665,7 @@ ...@@ -20665,7 +20665,7 @@
20665 20665
20666 var addstuff = '<div class="list-wrapper2 list-wrapper"><button type="button" class="back-one-level"><span>Back</span></button><div class="sub-menu-wrapper"></div></div><div class="list-wrapper3 list-wrapper"><button type="button" class="back-one-level"><span>Back</span></button><div class="sub-menu-wrapper"></div></div>'; 20666 var addstuff = '<div class="list-wrapper2 list-wrapper"><button type="button" class="back-one-level"><span>Back</span></button><div class="sub-menu-wrapper"></div></div><div class="list-wrapper3 list-wrapper"><button type="button" class="back-one-level"><span>Back</span></button><div class="sub-menu-wrapper"></div></div>';
20667 const pageHeader = document.querySelector("#main-nav"); 20667 const pageHeader = document.querySelector("#main-nav");
20668 pageHeader.querySelector(".mega-toggle-block"); 20668 const toggleMenu = pageHeader.querySelector(".mega-toggle-block");
20669 pageHeader.querySelector(".mega-menu-toggle.mega-menu-open"); 20669 pageHeader.querySelector(".mega-menu-toggle.mega-menu-open");
20670 const menuWrapper = pageHeader.querySelector("#mega-menu-primary"); 20670 const menuWrapper = pageHeader.querySelector("#mega-menu-primary");
20671 menuWrapper.innerHTML = menuWrapper.innerHTML + addstuff; 20671 menuWrapper.innerHTML = menuWrapper.innerHTML + addstuff;
...@@ -20729,13 +20729,25 @@ ...@@ -20729,13 +20729,25 @@
20729 const parent = this.closest(".list-wrapper"); 20729 const parent = this.closest(".list-wrapper");
20730 parent.classList.remove(isVisibleClass); 20730 parent.classList.remove(isVisibleClass);
20731 this.classList.remove(isBtVisible); 20731 this.classList.remove(isBtVisible);
20732 this.classList.remove(isBtVisible);
20733 setTimeout(() => { 20732 setTimeout(() => {
20734 parent.scrollTo({ 20733 parent.scrollTo({
20735 top: 0, 20734 top: 0,
20736 behavior: 'smooth' 20735 behavior: 'smooth'
20737 }); 20736 });
20738 }, 1000); 20737 }, 500);
20738 });
20739 toggleMenu.addEventListener("click", function () {
20740 setTimeout(() => {
20741 console.log('clicked toggleMenu');
20742 listWrapper2.scrollTo({
20743 top: 0,
20744 behavior: 'smooth'
20745 });
20746 listWrapper3.scrollTo({
20747 top: 0,
20748 behavior: 'smooth'
20749 });
20750 }, 500);
20739 }); 20751 });
20740 } 20752 }
20741 20753
......
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
...@@ -635,6 +635,7 @@ ...@@ -635,6 +635,7 @@
635 $("body").removeClass($menu.attr("id") + "-mobile-open"); 635 $("body").removeClass($menu.attr("id") + "-mobile-open");
636 $("html").removeClass($menu.attr("id") + "-off-canvas-open"); 636 $("html").removeClass($menu.attr("id") + "-off-canvas-open");
637 $('.list-wrapper').removeClass('is-visible'); 637 $('.list-wrapper').removeClass('is-visible');
638
638 }, plugin.settings.effect_speed_mobile); 639 }, plugin.settings.effect_speed_mobile);
639 640
640 $(".mega-toggle-label, .mega-toggle-animated", $toggle_bar).attr("aria-expanded", "false"); 641 $(".mega-toggle-label, .mega-toggle-animated", $toggle_bar).attr("aria-expanded", "false");
...@@ -657,6 +658,12 @@ ...@@ -657,6 +658,12 @@
657 }); 658 });
658 659
659 $toggle_bar.removeClass("mega-menu-open"); 660 $toggle_bar.removeClass("mega-menu-open");
661 var pageHeader = document.querySelector("#main-nav");
662 var listWrapper2 = pageHeader.querySelector(".list-wrapper2");
663 var listWrapper3 = pageHeader.querySelector(".list-wrapper3");
664 listWrapper2.scrollTo({ top: 0, behavior: 'smooth' } );
665 listWrapper3.scrollTo({ top: 0, behavior: 'smooth' } );
666 $('.back-one-level').removeClass('is-bt-active');
660 } 667 }
661 668
662 $menu.triggerHandler("mmm:hideMobileMenu"); 669 $menu.triggerHandler("mmm:hideMobileMenu");
......
...@@ -75,10 +75,17 @@ for (const backOneLevelBtn of backOneLevelBtns) { ...@@ -75,10 +75,17 @@ for (const backOneLevelBtn of backOneLevelBtns) {
75 const parent = this.closest(".list-wrapper"); 75 const parent = this.closest(".list-wrapper");
76 parent.classList.remove(isVisibleClass); 76 parent.classList.remove(isVisibleClass);
77 this.classList.remove(isBtVisible); 77 this.classList.remove(isBtVisible);
78 this.classList.remove(isBtVisible);
79 setTimeout(() => { 78 setTimeout(() => {
80 parent.scrollTo({ top: 0, behavior: 'smooth' } ); 79 parent.scrollTo({ top: 0, behavior: 'smooth' } );
81 }, 1000); 80 }, 500);
81
82 });
83 toggleMenu.addEventListener("click", function () {
84 setTimeout(() => {
85 console.log('clicked toggleMenu')
86 listWrapper2.scrollTo({ top: 0, behavior: 'smooth' } );
87 listWrapper3.scrollTo({ top: 0, behavior: 'smooth' } );
88 }, 500);
82 89
83 }); 90 });
84 } 91 }
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -2,6 +2,6 @@ ...@@ -2,6 +2,6 @@
2 Theme Name: MSF CA Child 2 Theme Name: MSF CA Child
3 Author: Tenzing Communications 3 Author: Tenzing Communications
4 Template: msf-ca 4 Template: msf-ca
5 Version: 1.0.497 5 Version: 1.0.499
6 */ 6 */
7 7
......