From 9bf7fd36e31863e9bf47217479d252608dc3e24c Mon Sep 17 00:00:00 2001 From: pxamike Date: Mon, 15 Apr 2019 15:14:57 +0200 Subject: [PATCH] [BUGFIX] Meta navigation hidden when using language menu in main-naivgation. Doesn't reappear when clicking languageMenuOverlay to close it. (#518) --- Resources/Public/css/main.js | 14 ++++++++++---- Resources/Public/less/main.js | 14 ++++++++++---- felayout_t3kit/dev/js/main/header/header.js | 14 ++++++++++---- 3 files changed, 30 insertions(+), 12 deletions(-) diff --git a/Resources/Public/css/main.js b/Resources/Public/css/main.js index 2c62f99e..28828b4c 100644 --- a/Resources/Public/css/main.js +++ b/Resources/Public/css/main.js @@ -148,18 +148,24 @@ jQuery(function ($) { $mainNavigationSearchBtn.toggleClass('_search-close-btn') $mainNavigationSearchBox.toggleClass('_search-box-visible') }) + $languageMenuBtn.on('click', function (e) { e.preventDefault() $languageMenuBox.addClass('_language-menu-box-visible') - $languageMenuOverlay.toggleClass('_language-menu-box-overlay-visible') - $metaNavigationNav.addClass('hidden') + $languageMenuOverlay.addClass('_language-menu-box-overlay-visible') + + // hide meta-navigation if showHeaderTopLangMenu = 1 + if ($('.header-top .js__header-top__language-menu-box').length) { + $metaNavigationNav.addClass('hidden') + } }) $languageMenuOverlay.on('click', function () { - $(this).toggleClass('_language-menu-box-overlay-visible') + $(this).removeClass('_language-menu-box-overlay-visible') $languageMenuBox.removeClass('_language-menu-box-visible') + $metaNavigationNav.removeClass('hidden') }) $languageMenuBoxCloseBtn.on('click', function () { - $languageMenuOverlay.toggleClass('_language-menu-box-overlay-visible') + $languageMenuOverlay.removeClass('_language-menu-box-overlay-visible') $languageMenuBox.removeClass('_language-menu-box-visible') $metaNavigationNav.removeClass('hidden') }) diff --git a/Resources/Public/less/main.js b/Resources/Public/less/main.js index 2c62f99e..28828b4c 100644 --- a/Resources/Public/less/main.js +++ b/Resources/Public/less/main.js @@ -148,18 +148,24 @@ jQuery(function ($) { $mainNavigationSearchBtn.toggleClass('_search-close-btn') $mainNavigationSearchBox.toggleClass('_search-box-visible') }) + $languageMenuBtn.on('click', function (e) { e.preventDefault() $languageMenuBox.addClass('_language-menu-box-visible') - $languageMenuOverlay.toggleClass('_language-menu-box-overlay-visible') - $metaNavigationNav.addClass('hidden') + $languageMenuOverlay.addClass('_language-menu-box-overlay-visible') + + // hide meta-navigation if showHeaderTopLangMenu = 1 + if ($('.header-top .js__header-top__language-menu-box').length) { + $metaNavigationNav.addClass('hidden') + } }) $languageMenuOverlay.on('click', function () { - $(this).toggleClass('_language-menu-box-overlay-visible') + $(this).removeClass('_language-menu-box-overlay-visible') $languageMenuBox.removeClass('_language-menu-box-visible') + $metaNavigationNav.removeClass('hidden') }) $languageMenuBoxCloseBtn.on('click', function () { - $languageMenuOverlay.toggleClass('_language-menu-box-overlay-visible') + $languageMenuOverlay.removeClass('_language-menu-box-overlay-visible') $languageMenuBox.removeClass('_language-menu-box-visible') $metaNavigationNav.removeClass('hidden') }) diff --git a/felayout_t3kit/dev/js/main/header/header.js b/felayout_t3kit/dev/js/main/header/header.js index 9c645ae4..977aef8e 100644 --- a/felayout_t3kit/dev/js/main/header/header.js +++ b/felayout_t3kit/dev/js/main/header/header.js @@ -146,18 +146,24 @@ jQuery(function ($) { $mainNavigationSearchBtn.toggleClass('_search-close-btn') $mainNavigationSearchBox.toggleClass('_search-box-visible') }) + $languageMenuBtn.on('click', function (e) { e.preventDefault() $languageMenuBox.addClass('_language-menu-box-visible') - $languageMenuOverlay.toggleClass('_language-menu-box-overlay-visible') - $metaNavigationNav.addClass('hidden') + $languageMenuOverlay.addClass('_language-menu-box-overlay-visible') + + // hide meta-navigation if showHeaderTopLangMenu = 1 + if ($('.header-top .js__header-top__language-menu-box').length) { + $metaNavigationNav.addClass('hidden') + } }) $languageMenuOverlay.on('click', function () { - $(this).toggleClass('_language-menu-box-overlay-visible') + $(this).removeClass('_language-menu-box-overlay-visible') $languageMenuBox.removeClass('_language-menu-box-visible') + $metaNavigationNav.removeClass('hidden') }) $languageMenuBoxCloseBtn.on('click', function () { - $languageMenuOverlay.toggleClass('_language-menu-box-overlay-visible') + $languageMenuOverlay.removeClass('_language-menu-box-overlay-visible') $languageMenuBox.removeClass('_language-menu-box-visible') $metaNavigationNav.removeClass('hidden') })