From 53b8312d4b402df69f17cdedd3f023d820f2c977 Mon Sep 17 00:00:00 2001 From: Vincent Vanwaelscappel Date: Fri, 18 Jul 2025 16:56:09 +0200 Subject: [PATCH] wip #7650 @3 --- js/libs/fluidbook/fluidbook.links.animations.js | 10 ++++++++++ js/libs/fluidbook/fluidbook.links.js | 6 +++--- js/libs/fluidbook/fluidbook.mobilefirst.js | 2 +- style/cart.less | 2 +- style/links.less | 2 +- 5 files changed, 16 insertions(+), 6 deletions(-) diff --git a/js/libs/fluidbook/fluidbook.links.animations.js b/js/libs/fluidbook/fluidbook.links.animations.js index dbe1239f..bef8a2d9 100644 --- a/js/libs/fluidbook/fluidbook.links.animations.js +++ b/js/libs/fluidbook/fluidbook.links.animations.js @@ -221,6 +221,16 @@ FluidbookLinksAnimations.prototype = { from.opacity = css.opacity; } to.opacity = 0; + } else if (animation.type === 'keephidden') { + from.display = 'none'; + to.display = 'block'; + to.visibility = 'visible'; + if (css.opacity !== undefined) { + from.opacity = css.opacity; + } else { + from.opacity = 0; + } + to.opacity = 0; } else if (animation.type === "unmask" || animation.type === 'reveal') { if (animation.type === 'reveal') { from.display = 'none'; diff --git a/js/libs/fluidbook/fluidbook.links.js b/js/libs/fluidbook/fluidbook.links.js index 1ee8a1f4..94dbe385 100644 --- a/js/libs/fluidbook/fluidbook.links.js +++ b/js/libs/fluidbook/fluidbook.links.js @@ -840,7 +840,7 @@ FluidbookLinks.prototype = { var animateBookmarks = (this.fluidbook.settings.bookmarkBlinkOnPageChange == true); var $this = this; - var links = $(container).find(".link a.displayArea"); + var links = $(container).find(".link a[data-animation]"); if (!this.fluidbook.mobilefirst.enabled) { $(links).each(function () { @@ -930,8 +930,8 @@ FluidbookLinks.prototype = { }, animateLink: function (link, additionalDelay) { - if (!$(link).is('.displayArea')) { - link = $(link).find('.displayArea'); + if (!$(link).is('[data-animation]')) { + link = $(link).find('[data-animation]'); } if (additionalDelay === undefined) { additionalDelay = 0; diff --git a/js/libs/fluidbook/fluidbook.mobilefirst.js b/js/libs/fluidbook/fluidbook.mobilefirst.js index 9dcf1692..e510306d 100644 --- a/js/libs/fluidbook/fluidbook.mobilefirst.js +++ b/js/libs/fluidbook/fluidbook.mobilefirst.js @@ -77,7 +77,7 @@ FluidbookMobileFirst.prototype = { } if (rect.top < $this.fluidbook.resize.hh) { $(this).addClass('revealed'); - if ($(this).find('a.displayArea').length > 0) { + if ($(this).find('a[data-display-area!="none"]').length > 0) { $this.fluidbook.links.animateLink(this, delay); } else if ($(this).is('.multimedia.notinteractive')) { var url = $(this).find('iframe').attr('src'); diff --git a/style/cart.less b/style/cart.less index adf340d4..1a536ce2 100644 --- a/style/cart.less +++ b/style/cart.less @@ -123,7 +123,7 @@ a[data-cart-ref] { } } - &.displayArea:hover { + &[data-display-area="fill"]:hover { background-color: @links-area-color; mix-blend-mode: multiply; diff --git a/style/links.less b/style/links.less index fb9074f7..1e332f30 100644 --- a/style/links.less +++ b/style/links.less @@ -249,7 +249,7 @@ display: block; background-color: transparent; - &.displayArea { + &[data-display-area="fill"]{ -webkit-tap-highlight-color: @links-area-color; background-color: fadeout(@links-color, 99.999%); border-radius: unit(@links-rounded-corners*2, px); -- 2.39.5