From f1c74a4e3b73155f0390a8d2121b1004927e326b Mon Sep 17 00:00:00 2001 From: Vincent Vanwaelscappel Date: Fri, 26 Sep 2025 19:31:58 +0200 Subject: [PATCH] wip #7762 @14 --- .../cart/fluidbook.cart.joueclub2024.js | 3 --- js/libs/fluidbook/fluidbook.links.js | 1 - js/libs/fluidbook/fluidbook.loader.js | 16 ++++++++++++---- js/libs/fluidbook/fluidbook.pagetransitions.js | 7 ++++++- js/libs/fluidbook/fluidbook.search.js | 1 - 5 files changed, 18 insertions(+), 10 deletions(-) diff --git a/js/libs/fluidbook/cart/fluidbook.cart.joueclub2024.js b/js/libs/fluidbook/cart/fluidbook.cart.joueclub2024.js index c0cd6a02..d3ae7bb2 100644 --- a/js/libs/fluidbook/cart/fluidbook.cart.joueclub2024.js +++ b/js/libs/fluidbook/cart/fluidbook.cart.joueclub2024.js @@ -48,7 +48,6 @@ FluidbookCartJoueClub2024.prototype = { }, removeFromCart: function (key) { - console.log('remove from cart ' + key); this.items.splice(key, 1); this.save(); }, @@ -59,12 +58,10 @@ FluidbookCartJoueClub2024.prototype = { }, updateLinks: function () { - console.log('update links'); $('[data-jc2024]').find('iframe').contents().find('body').removeClass('active'); try { var references = this.getItemsReferences(); - console.log(references); $.each(references, function (k, ref) { $('[data-jc2024="' + ref + '"]').find('iframe').contents().find('body').addClass('active'); }); diff --git a/js/libs/fluidbook/fluidbook.links.js b/js/libs/fluidbook/fluidbook.links.js index 98cde3f3..eb1fd557 100644 --- a/js/libs/fluidbook/fluidbook.links.js +++ b/js/libs/fluidbook/fluidbook.links.js @@ -826,7 +826,6 @@ FluidbookLinks.prototype = { container = $("#currentDoublePage,.page.current"); } let linksToAnimate = $(container).find('[data-animations]'); - console.log(linksToAnimate); linksToAnimate.each(function () { $this.animateContentLink($(this), true); }); diff --git a/js/libs/fluidbook/fluidbook.loader.js b/js/libs/fluidbook/fluidbook.loader.js index 7865a966..41f69a60 100644 --- a/js/libs/fluidbook/fluidbook.loader.js +++ b/js/libs/fluidbook/fluidbook.loader.js @@ -234,11 +234,18 @@ FluidbookLoader.prototype = { if (child === undefined) { child = ''; } + let selector; if (this.fluidbook.elasticslide.isActive()) { - return $("#epage_" + page + ' ' + child); + selector = '#epage_'; + } else { - return $("#page_" + page + ' ' + child); + selector = "#page_"; + } + selector += (page); + if (child) { + selector += " " + child; } + return $(selector); }, _preloadPageAfterSecurityChecks: function (page, callback) { @@ -412,8 +419,7 @@ FluidbookLoader.prototype = { if ($(container).length === 0) { container = false; } - if ((container !== false && this.fluidbook.elasticslide.isActive()) || - (container === false && !this.fluidbook.elasticslide.isActive())) { + if ((container !== false && this.fluidbook.elasticslide.isActive()) || (container === false && !this.fluidbook.elasticslide.isActive())) { return; } if (position !== 'left' && position !== 'right') { @@ -425,6 +431,7 @@ FluidbookLoader.prototype = { return; } + if (container) { // The page is already here. if ($(container).find('.' + position + '#page_' + pageNr).length > 0) { @@ -461,6 +468,7 @@ FluidbookLoader.prototype = { } this.addCLinks(pageNr); + console.log($(page)); callback(); return; } diff --git a/js/libs/fluidbook/fluidbook.pagetransitions.js b/js/libs/fluidbook/fluidbook.pagetransitions.js index 5df15646..a1caa1fc 100644 --- a/js/libs/fluidbook/fluidbook.pagetransitions.js +++ b/js/libs/fluidbook/fluidbook.pagetransitions.js @@ -46,7 +46,8 @@ FluidbookPageTransition.prototype = { return "immediate"; } } - return this.transitionType(); + let res = this.transitionType(); + return res; }, transitionType: function () { @@ -543,16 +544,20 @@ FluidbookPageTransition.prototype = { } this.pauseNetworkDuringPagesPreload(); this.fluidbook.loader.preloadPagesBeforeTransition(turning.end, function () { + console.log('preloaded pages before transition') $this.fluidbook.loader.setContentsInDoublePage(doublePage, turning.end, true, function () { + console.log('set contents in double page') $this.pauseNetworkDuringTransition(pageNr); $this.beforeTransition(pageNr, 2, turning); $("#currentDoublePage").addClass('axis_' + $this.transitionAxis).addClass('_2d').addClass(turning.currentToClass); $(doublePage).removeClass(turning.nextFromClass).one($this.fluidbook.support.getTransitionEndEvent(), function () { + console.log('transition done'); if ($this.transitionning === false) { return; } $("#currentDoublePage").remove(); $("#nextDoublePage").attr('id', 'currentDoublePage'); + $this.afterTransition(pageNr); }); }); diff --git a/js/libs/fluidbook/fluidbook.search.js b/js/libs/fluidbook/fluidbook.search.js index 9fb8b400..791fe678 100644 --- a/js/libs/fluidbook/fluidbook.search.js +++ b/js/libs/fluidbook/fluidbook.search.js @@ -21,7 +21,6 @@ FluidbookSearch.prototype = { init: function () { var $this = this; $(this.fluidbook).on('fluidbook.page.change.end', function (e, pageNr) { - console.log(':)'); $this.highlightSearchTerms(pageNr); }); $(document).on('change', '#q', function () { -- 2.39.5