From 61ab8117e3969652ff103a7b17a7f6f174e738ee Mon Sep 17 00:00:00 2001 From: Vincent Vanwaelscappel Date: Wed, 31 May 2023 13:37:21 +0200 Subject: [PATCH] wait #5973 @0.5 --- js/libs/fluidbook/fluidbook.links.js | 19 +++++++++++++++---- style/fluidbook.less | 2 +- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/js/libs/fluidbook/fluidbook.links.js b/js/libs/fluidbook/fluidbook.links.js index 107bdf5a..33c40dd7 100644 --- a/js/libs/fluidbook/fluidbook.links.js +++ b/js/libs/fluidbook/fluidbook.links.js @@ -233,6 +233,7 @@ FluidbookLinks.prototype = { $this.showLinkAnimating = false; }, 1000); var mode = $(this).data('showmode'); + var transition = $(this).data('showtransition') ? $(this).data('showtransition') : 'fadein'; var ids = $(this).data('showid').toString().split(','); if (mode === 'hide') { @@ -295,8 +296,8 @@ FluidbookLinks.prototype = { showid = ids; } + let showTimeout = 10; if (mode === 'exclusiveshow' || mode === 'shownext' || mode === 'shownextcycle' || mode === 'showprev' || mode === 'showprevcycle' || mode === 'pickrandom') { - var selector = 'div.link[data-hidden="1"].show'; var hide = []; // Only hide links that are in the list @@ -321,11 +322,17 @@ FluidbookLinks.prototype = { if (mode === 'exclusiveshow') { hide = 'all'; } + + + var to=900; + showTimeout = (transition === 'fadeoutin') ? to : 10; + let hideTimeout = (transition === 'fadeoutin') ? 10 : to; + $.each(showid, function (k, id) { selector += ':not([data-id$="' + id + '"])'; }); $(selector).each(function () { - var timeout = (mode === 'shownext' || mode === 'shownextcycle' || mode === 'showprev' || mode === 'showprevcycle') ? 900 : 0; + let timeout = hideTimeout; if ($(selector).is('[data-animation-hide]')) { timeout = 0; } @@ -337,9 +344,13 @@ FluidbookLinks.prototype = { $this.hidePlacedLink(this, timeout); } }); + + } var close = $(this).data('showclose'); + + $.each(showid, function (k, id) { $('div.link[data-id$="' + id + '"]').each(function () { var l = this; @@ -374,7 +385,7 @@ FluidbookLinks.prototype = { } $(l).addClass('show'); $this.updateAttachedLinks(); - }, 10); + }, showTimeout); }); }); @@ -567,7 +578,7 @@ FluidbookLinks.prototype = { setTimeout(function () { $(p).hide(); $this.updateAttachedLinks(); - }, 500); + }, 2000); $this.updateAttachedLinks(); }, timeout); }, diff --git a/style/fluidbook.less b/style/fluidbook.less index 1c7aeae6..310f4834 100644 --- a/style/fluidbook.less +++ b/style/fluidbook.less @@ -1461,7 +1461,7 @@ html.ios body.portrait #interface { .link { &[data-hidden="1"] { - transition: opacity 750ms; + transition: opacity 750ms, visibility 750ms; visibility: hidden; opacity: 0; -- 2.39.5