]> _ Git - fluidbook-html5.git/commitdiff
wip #7762 @14
authorVincent Vanwaelscappel <vincent@cubedesigners.com>
Fri, 26 Sep 2025 17:31:58 +0000 (19:31 +0200)
committerVincent Vanwaelscappel <vincent@cubedesigners.com>
Fri, 26 Sep 2025 17:31:58 +0000 (19:31 +0200)
js/libs/fluidbook/cart/fluidbook.cart.joueclub2024.js
js/libs/fluidbook/fluidbook.links.js
js/libs/fluidbook/fluidbook.loader.js
js/libs/fluidbook/fluidbook.pagetransitions.js
js/libs/fluidbook/fluidbook.search.js

index c0cd6a027e1af0072edda48252cddc3314f65c9b..d3ae7bb2be0b7846fdd1cfc9f33f3ceb15863a7c 100644 (file)
@@ -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');
             });
index 98cde3f367179e2be71fe1c6aca875ae8d0c2adb..eb1fd5576ca289853367effa1f4616ff3be2c606 100644 (file)
@@ -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);
         });
index 7865a966e85a9352a30f5531315e9396cbb92e74..41f69a60c1f5b016d9b3e5878e3e20a838bd7d95 100644 (file)
@@ -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;
             }
index 5df15646f8678c5c608b3193e4481521fe555f40..a1caa1fc2ce24a827e973c0ba0c229080f95c4c1 100644 (file)
@@ -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);
                 });
             });
index 9fb8b400ecbe96b0f891ee4a741aed713b212bec..791fe678380b7a095bb67fa53bc253432f4fab2a 100644 (file)
@@ -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 () {