[BUGFIX] searchBtn/searchBox toggle rewrite. (#515)

t3kit · Apr 16, 2019 · 08b1ecd · 08b1ecd
1 parent f28b2cd
commit 08b1ecd
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 15 deletions.
diff --git a/Resources/Public/css/main.js b/Resources/Public/css/main.js
@@ -138,17 +138,20 @@ jQuery(function ($) {
 
   $mainNavigationSearchBtn.on('click', function (e) {
     e.preventDefault()
-    $(this).toggleClass('_search-close-btn')
     $mainNavigationSearchBox.toggleClass('_search-box-visible')
     if ($mainNavigationSearchBox.hasClass('_search-box-visible')) {
       $mainNavigationSearchBox.find('input[type="search"]').focus()
+      $mainNavigationSearchBtn.addClass('_search-close-btn')
+      $mainNavigationSearchBoxOverlay.addClass('_search-box-overlay-visible')
+    } else {
+      $mainNavigationSearchBtn.removeClass('_search-close-btn')
+      $mainNavigationSearchBoxOverlay.removeClass('_search-box-overlay-visible')
     }
-    $mainNavigationSearchBoxOverlay.toggleClass('_search-box-overlay-visible')
   })
   $mainNavigationSearchBoxOverlay.on('click', function () {
-    $(this).toggleClass('_search-box-overlay-visible')
-    $mainNavigationSearchBtn.toggleClass('_search-close-btn')
-    $mainNavigationSearchBox.toggleClass('_search-box-visible')
+    $(this).removeClass('_search-box-overlay-visible')
+    $mainNavigationSearchBtn.removeClass('_search-close-btn')
+    $mainNavigationSearchBox.removeClass('_search-box-visible')
   })
 
   $languageMenuBtn.on('click', function (e) {

diff --git a/Resources/Public/less/main.js b/Resources/Public/less/main.js
@@ -138,17 +138,20 @@ jQuery(function ($) {
 
   $mainNavigationSearchBtn.on('click', function (e) {
     e.preventDefault()
-    $(this).toggleClass('_search-close-btn')
     $mainNavigationSearchBox.toggleClass('_search-box-visible')
     if ($mainNavigationSearchBox.hasClass('_search-box-visible')) {
       $mainNavigationSearchBox.find('input[type="search"]').focus()
+      $mainNavigationSearchBtn.addClass('_search-close-btn')
+      $mainNavigationSearchBoxOverlay.addClass('_search-box-overlay-visible')
+    } else {
+      $mainNavigationSearchBtn.removeClass('_search-close-btn')
+      $mainNavigationSearchBoxOverlay.removeClass('_search-box-overlay-visible')
     }
-    $mainNavigationSearchBoxOverlay.toggleClass('_search-box-overlay-visible')
   })
   $mainNavigationSearchBoxOverlay.on('click', function () {
-    $(this).toggleClass('_search-box-overlay-visible')
-    $mainNavigationSearchBtn.toggleClass('_search-close-btn')
-    $mainNavigationSearchBox.toggleClass('_search-box-visible')
+    $(this).removeClass('_search-box-overlay-visible')
+    $mainNavigationSearchBtn.removeClass('_search-close-btn')
+    $mainNavigationSearchBox.removeClass('_search-box-visible')
   })
 
   $languageMenuBtn.on('click', function (e) {

diff --git a/felayout_t3kit/dev/js/main/header/header.js b/felayout_t3kit/dev/js/main/header/header.js
@@ -136,17 +136,20 @@ jQuery(function ($) {
 
   $mainNavigationSearchBtn.on('click', function (e) {
     e.preventDefault()
-    $(this).toggleClass('_search-close-btn')
     $mainNavigationSearchBox.toggleClass('_search-box-visible')
     if ($mainNavigationSearchBox.hasClass('_search-box-visible')) {
       $mainNavigationSearchBox.find('input[type="search"]').focus()
+      $mainNavigationSearchBtn.addClass('_search-close-btn')
+      $mainNavigationSearchBoxOverlay.addClass('_search-box-overlay-visible')
+    } else {
+      $mainNavigationSearchBtn.removeClass('_search-close-btn')
+      $mainNavigationSearchBoxOverlay.removeClass('_search-box-overlay-visible')
     }
-    $mainNavigationSearchBoxOverlay.toggleClass('_search-box-overlay-visible')
   })
   $mainNavigationSearchBoxOverlay.on('click', function () {
-    $(this).toggleClass('_search-box-overlay-visible')
-    $mainNavigationSearchBtn.toggleClass('_search-close-btn')
-    $mainNavigationSearchBox.toggleClass('_search-box-visible')
+    $(this).removeClass('_search-box-overlay-visible')
+    $mainNavigationSearchBtn.removeClass('_search-close-btn')
+    $mainNavigationSearchBox.removeClass('_search-box-visible')
   })
 
   $languageMenuBtn.on('click', function (e) {