diff --git a/static/javascript/mobileview.js b/static/javascript/mobileview.js index d55342aa844a206d930989c8bb995065ddef9261..05b4b279737c56b79456159db699f051c97e68ad 100644 --- a/static/javascript/mobileview.js +++ b/static/javascript/mobileview.js @@ -134,25 +134,28 @@ $(document).ready(function() { function ToggleHeaderMenus () { - // Check if menu or icon has been clicked. - if ((clickOnHeaderNav) == true || (clickOnHeaderIcon) == true) { - //console.log("clickOnFooterIcon Value: " + clickOnFooterIcon + " FooterNav Clicked"); - //console.log("clickOnFooterNav Value: " + clickOnFooterNav + " FooterMenu Clicked"); - // Check if HeaderIcon has been clicked. - if ((clickOnHeaderIcon) == true) { - // If Menu is currently visible. - if ($("#header-nav .nav-wrapper").hasClass("display-flex")) { - console.log("Closing Header Menu."); - $("#header-nav .nav-wrapper").addClass("display-none").removeClass("display-flex"); - } else { - console.log("Opening Header Menu."); - $("#header-nav .nav-wrapper").addClass("display-flex").removeClass("display-none"); - } - } - } else { - // Menu has not been clicked on. Closing if open. - console.log("Closing Header Menu."); - $("#header-nav .nav-wrapper").addClass("display-none").removeClass("display-flex"); + // Only toggle header if in mobile view. + if (isSizeMobile(size)) { + // Check if menu or icon has been clicked. + if ((clickOnHeaderNav) == true || (clickOnHeaderIcon) == true) { + //console.log("clickOnFooterIcon Value: " + clickOnFooterIcon + " FooterNav Clicked"); + //console.log("clickOnFooterNav Value: " + clickOnFooterNav + " FooterMenu Clicked"); + // Check if HeaderIcon has been clicked. + if ((clickOnHeaderIcon) == true) { + // If Menu is currently visible. + if ($("#header-nav .nav-wrapper").hasClass("display-flex")) { + console.log("Closing Header Menu."); + $("#header-nav .nav-wrapper").addClass("display-none").removeClass("display-flex"); + } else { + console.log("Opening Header Menu."); + $("#header-nav .nav-wrapper").addClass("display-flex").removeClass("display-none"); + } + } + } else { + // Menu has not been clicked on. Closing if open. + console.log("Closing Header Menu."); + $("#header-nav .nav-wrapper").addClass("display-none").removeClass("display-flex"); + } } // Default vars to false once processing has occured. @@ -289,7 +292,7 @@ $(document).ready(function() { $("#header-nav .nav-wrapper").removeClass("display-none display-flex"); // Remove mobile-set classes from nav submenus. - $(".nav-sub-menu").removeClass("display-none display-flex"); + $("#header-nav .nav-sub-menu").removeClass("display-none display-flex"); // Set navigation to horizontal mode. $("#header-nav .nav-wrapper").addClass("horiz-nav").removeClass("vert-nav");