wip #7489 @5

diff --git a/js/libs/fluidbook/fluidbook.pagetransitions.js b/js/libs/fluidbook/fluidbook.pagetransitions.js
index 5c2273b664d595df882078fff4317ab4bdbb9006..4b3140ae06ce2ff92db4c5b9e0cb3b65048824df 100644 (file)
--- 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 5857107136337a1306bee20c7d6b5b74422077cf..5938a3cb0872cf7252c5e52a0f01aa6d5dc4c682 100644 (file)
--- 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