From: Vincent Vanwaelscappel <vincent@cubedesigners.com>
Date: Thu, 24 Jul 2025 14:50:42 +0000 (+0200)
Subject: wip #7489 @5
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=cf6548e9aefdfa55d05dc82e1c39b8e82788432d;p=fluidbook-html5.git

wip #7489 @5
---

diff --git a/js/libs/fluidbook/fluidbook.pagetransitions.js b/js/libs/fluidbook/fluidbook.pagetransitions.js
index 5c2273b6..4b3140ae 100644
--- a/js/libs/fluidbook/fluidbook.pagetransitions.js
+++ b/js/libs/fluidbook/fluidbook.pagetransitions.js
@@ -46,6 +46,10 @@ FluidbookPageTransition.prototype = {
                 return "immediate";
             }
         }
+        return this.transitionType();
+    },
+
+    transitionType: function () {
         if (this.fluidbook.settings.mobileTransitions === 'fade') {
             if (this.fluidbook.displayOnePage) {
                 return 'fadeone';
@@ -80,7 +84,6 @@ FluidbookPageTransition.prototype = {
             return 'flip3d';
         }
         return 'flipcss';
-
     },
 
     pageTransition: function (pageNr, transitionType) {
diff --git a/js/libs/fluidbook/fluidbook.touch.js b/js/libs/fluidbook/fluidbook.touch.js
index 58571071..5938a3cb 100644
--- a/js/libs/fluidbook/fluidbook.touch.js
+++ b/js/libs/fluidbook/fluidbook.touch.js
@@ -162,7 +162,7 @@ FluidbookTouch.prototype = {
         if (this.panInited) {
             return;
         }
-        var $this=this;
+        var $this = this;
 
         this.panInited = true;
         if (panElementId === undefined) {
@@ -289,7 +289,7 @@ FluidbookTouch.prototype = {
 
             }
 
-            if(this.fluidbook.input.usingMouse){
+            if (this.fluidbook.input.usingMouse) {
                 return false;
             }
 
@@ -365,5 +365,8 @@ FluidbookTouch.prototype = {
 
         this.fluidbook.zoom.setOrigin(ox, oy, true);
     },
-};
 
+    elasticSlide: function () {
+        return this.fluidbook.settings.slideTransitionsElastic == '1' && ['slide', 'portrait', 'slidefullwidth'].indexOf(this.fluidbook.pagetransitions.transitionType()) >= 0;
+    }
+};
\ No newline at end of file