From a8bd3d1a5171d46e1270c5c4249f03452cfc393e Mon Sep 17 00:00:00 2001
From: Vinicius Pereira <58730-viniciusrp@users.noreply.drupalcode.org>
Date: Fri, 22 Dec 2023 12:39:30 +0000
Subject: [PATCH] Revert "Issue #3401217 by agami4: Improve behavior secondary
nav"
This reverts commit 5717a9a75c8d05dab43f73631c325e8ba445b278
---
assets/js/navbar-secondary--sky.min.js | 2 +-
.../navigation/navbar/navbar-secondary--sky.js | 17 +++++++++--------
2 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/assets/js/navbar-secondary--sky.min.js b/assets/js/navbar-secondary--sky.min.js
index 37aa0a3a..d97777b6 100644
--- a/assets/js/navbar-secondary--sky.min.js
+++ b/assets/js/navbar-secondary--sky.min.js
@@ -1 +1 @@
-!function(u){Drupal.behaviors.navbarSecondaryScrollable={attach:function(f){u(window).on("load",function(){setTimeout(function(){var t=u(".navbar-secondary .navbar-scrollable",f),i=t.find(".nav",f),l=i.find("li",f),n=t.width(),e=i.width(),o=u(".region--content");function a(){900<=u(window).width()?n<e?i.each(function(){var i=u(this),n=0;l.removeClass("visible-item"),i.find(".caret").remove(),l.parent().is("div")&&l.unwrap();for(var e=0;e<l.length&&(n+=u(l[e]).width(),!(t.width()-50<=n));++e)u(l[e]).addClass("visible-item");i.find("li.visible-item").wrapAll('<div class="visible-list"></div>'),i.find("li:not(.visible-item)").wrapAll('<div class="hidden-list card" />'),i.append('<span class="caret"></span>');var a=i.find(".hidden-list"),s=i.find(".caret");s.on("click",function(){a.is(":hidden")?(o.addClass("js--z-index"),a.slideDown("300")):a.slideUp("300",function(){o.removeClass("js--z-index")}),u(this).toggleClass("active")}),u(document).on("click",function(i){i.stopPropagation(),u(i.target).closest(".navbar-secondary").length||(a.slideUp(300,function(){o.removeClass("js--z-index")}),s.removeClass("active"))})}):i.css("display","flex"):i.each(function(){var i=u(this);l.removeClass("visible-item"),i.find(".caret").remove(),l.parent().is("div")&&l.unwrap()})}a();var s,d,r,c,v=(s=function(){a()},d=250,function(){var i=this,n=arguments,e=r&&!c;clearTimeout(c),c=setTimeout(function(){c=null,r||s.apply(i,n)},d),e&&s.apply(i,n)});window.addEventListener("resize",v)},1e3)})}}}(jQuery);
\ No newline at end of file
+!function(u){Drupal.behaviors.navbarSecondaryScrollable={attach:function(f){u(window).on("load",function(){Promise.resolve(1).then(function(){var t=u(".navbar-secondary .navbar-scrollable",f),i=t.find(".nav",f),l=i.find("li",f),n=t.width(),e=i.width(),o=u(".region--content");function a(){900<=u(window).width()?n<e?i.each(function(){var i=u(this),n=0;l.removeClass("visible-item"),i.find(".caret").remove(),l.parent().is("div")&&l.unwrap();for(var e=0;e<l.length&&(n+=u(l[e]).width(),!(t.width()-50<=n));++e)u(l[e]).addClass("visible-item");i.find("li.visible-item").wrapAll('<div class="visible-list"></div>'),i.find("li:not(.visible-item)").wrapAll('<div class="hidden-list card" />'),i.append('<span class="caret"></span>');var a=i.find(".hidden-list"),s=i.find(".caret");s.on("click",function(){a.is(":hidden")?(o.addClass("js--z-index"),a.slideDown("300")):a.slideUp("300",function(){o.removeClass("js--z-index")}),u(this).toggleClass("active")}),u(document).on("click",function(i){i.stopPropagation(),u(i.target).closest(".navbar-secondary").length||(a.slideUp(300,function(){o.removeClass("js--z-index")}),s.removeClass("active"))})}):i.css("display","flex"):i.each(function(){var i=u(this);l.removeClass("visible-item"),i.find(".caret").remove(),l.parent().is("div")&&l.unwrap()})}a();var s,d,r,c,v=(s=function(){a()},d=250,function(){var i=this,n=arguments,e=r&&!c;clearTimeout(c),c=setTimeout(function(){c=null,r||s.apply(i,n)},d),e&&s.apply(i,n)});window.addEventListener("resize",v)})})}}}(jQuery);
\ No newline at end of file
diff --git a/components/03-molecules/navigation/navbar/navbar-secondary--sky.js b/components/03-molecules/navigation/navbar/navbar-secondary--sky.js
index 7b3ea3b1..050b5587 100644
--- a/components/03-molecules/navigation/navbar/navbar-secondary--sky.js
+++ b/components/03-molecules/navigation/navbar/navbar-secondary--sky.js
@@ -26,18 +26,19 @@
$(window).on('load', function () {
// Sometimes after reload page, we can not find elements on the
// secondary navigation. Promise function fixed it.
- setTimeout(function () {
- var navScroll = $('.navbar-secondary .navbar-scrollable', context);
- var navSecondary = navScroll.find('.nav', context);
- var items = navSecondary.find('li', context);
- var navScrollWidth = navScroll.width();
- var navSecondaryWidth = navSecondary.width();
- var regionContent = $('.region--content');
+ Promise.resolve(1).then(function() {
+ var navScroll = $('.navbar-secondary .navbar-scrollable', context);
+ var navSecondary = navScroll.find('.nav', context);
+ var items = navSecondary.find('li', context);
+ var navScrollWidth = navScroll.width();
+ var navSecondaryWidth = navSecondary.width();
+ var regionContent = $('.region--content');
// Secondary navigation behaviour,
function secondaryNavBehaviour() {
if($(window).width() >= 900) {
if (navSecondaryWidth > navScrollWidth) {
+
navSecondary.each(function () {
var $this = $(this);
var total = 0;
@@ -124,7 +125,7 @@
}, 250);
window.addEventListener('resize', returnedFunction);
- }, 1000);
+ });
});
}
};
--
GitLab