From 13ed6a22bb762fc479925a8220fa3f3679b181be Mon Sep 17 00:00:00 2001 From: Vincent Vanwaelscappel Date: Wed, 29 Nov 2023 12:24:10 +0100 Subject: [PATCH] wait #6533 @0.5 --- js/libs/fluidbook/fluidbook.links.js | 10 +++++++++- js/libs/fluidbook/fluidbook.loader.js | 6 +++--- js/libs/fluidbook/fluidbook.video.js | 2 +- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/js/libs/fluidbook/fluidbook.links.js b/js/libs/fluidbook/fluidbook.links.js index 3657bb0f..1beb8c44 100644 --- a/js/libs/fluidbook/fluidbook.links.js +++ b/js/libs/fluidbook/fluidbook.links.js @@ -705,6 +705,12 @@ FluidbookLinks.prototype = { initDelayedLink: function (link) { $(link).addClass('revealed'); this.fluidbook.video.initVideos(); + this.initInlineSlideshows(); + }, + + isDelayed: function (e) { + let s = '[data-delay]:not(.revealed)'; + return $(e).is(s) || $(e).closest(s).length > 0; }, replaceVariableInTextLinks: function () { @@ -1281,7 +1287,9 @@ FluidbookLinks.prototype = { if (this.fluidbook.slideshow !== undefined) { $("#links .fb-slideshow, #currentDoublePage .fb-slideshow").each(function () { - $this.fluidbook.slideshow.initInlineSlideshow(this); + if (!$this.isDelayed(this)) { + $this.fluidbook.slideshow.initInlineSlideshow(this); + } }); this.fluidbook.slideshow.resizeInline(); } diff --git a/js/libs/fluidbook/fluidbook.loader.js b/js/libs/fluidbook/fluidbook.loader.js index 7fbae471..83c26759 100644 --- a/js/libs/fluidbook/fluidbook.loader.js +++ b/js/libs/fluidbook/fluidbook.loader.js @@ -241,8 +241,6 @@ FluidbookLoader.prototype = { } var $__callback = function () { - - if ($this.getVersionToLoad(page) === 'textasvector' || $this.getVersionToLoad(page) === 'vector') { $this.loadTexts(page, $_callback); } else { @@ -353,7 +351,9 @@ FluidbookLoader.prototype = { }); }); } - }, loadPage: function (pageNr, doublePage, position, callback) { + }, + + loadPage: function (pageNr, doublePage, position, callback) { if (pageNr <= 0 || pageNr > this.fluidbook.settings.pages) { callback(); diff --git a/js/libs/fluidbook/fluidbook.video.js b/js/libs/fluidbook/fluidbook.video.js index eaf16dd5..04224bae 100644 --- a/js/libs/fluidbook/fluidbook.video.js +++ b/js/libs/fluidbook/fluidbook.video.js @@ -82,7 +82,7 @@ FluidbookVideo.prototype = { var $this = this; $(".videoContainer").each(function () { - if ($(this).closest('[data-delay]:not(.revealed)').length > 0) { + if ($this.fluidbook.links.isDelayed(this)) { return; } if ($(this).closest('.rightclone').length > 0 && $(this).is(':hidden')) { -- 2.39.5