wip #2312 @1

diff --git a/js/libs/fluidbook/fluidbook.js b/js/libs/fluidbook/fluidbook.js
index a2d99b31884c90e707c7e0ed3615c32ec391dc9f..a8ad7e8ecbd4904cdbf8495c12c111c6cdb54c6f 100644 (file)
--- a/js/libs/fluidbook/fluidbook.js
+++ b/js/libs/fluidbook/fluidbook.js
@@ -437,7 +437,6 @@ Fluidbook.prototype = {
             this.menu.openView(view, args[2], args[3], function () {
                 $this.hideSplash();
             });
-            this.zoom.resetZoom();
         }
         return;
     },

diff --git a/js/libs/fluidbook/fluidbook.pagetransitions.js b/js/libs/fluidbook/fluidbook.pagetransitions.js
index 39671661ed56159160cd0cad2e05b3333a0d07a9..13504ec76a9a54d5d66a6fc085105de4bd769673 100644 (file)
--- a/js/libs/fluidbook/fluidbook.pagetransitions.js
+++ b/js/libs/fluidbook/fluidbook.pagetransitions.js
@@ -31,20 +31,27 @@ FluidbookPageTransition.prototype = {
         pageNr = this.fluidbook.normalizePage(pageNr);
         if (this.fluidbook.firstTransition || pageNr == this.fluidbook.normalizePage(this.fluidbook.currentPage) || this.fluidbook.currentPage == -1 || !this.fluidbook.support.transitions2d || this.fluidbook.datas.mobileTransitions == 'none') {
             this.fluidbook.firstTransition = false;
+            this.fluidbook.zoom.resetZoom();
             return this.pageTransition1D(pageNr);
         }
 
         if (this.fluidbook.displayOnePage) {
+            this.fluidbook.zoom.resetZoom();
             return this.pageTransition2DPortrait(pageNr);
         }
 
         if ((!this.fluidbook.support.transitions3d && !this.fluidbook.support.transitions3dacc) || this.fluidbook.datas.mobileTransitions == 'slide') {
+            this.fluidbook.zoom.resetZoom();
             return this.pageTransition2D(pageNr);
         }
 
         if (this.fluidbook.support.transitions3dacc) {
-            return this.pageTransition3DFlip(pageNr);
+            this.fluidbook.zoom.resetZoom(function(){
+                return this.pageTransition3DFlip(pageNr);
+            });
+            return true;
         } else {
+            this.fluidbook.zoom.resetZoom();
             return this.pageTransition3D(pageNr);
         }
     },

diff --git a/js/libs/fluidbook/fluidbook.zoom.js b/js/libs/fluidbook/fluidbook.zoom.js
index e89a9efbc3ab4a0f8867199a7c86f4930a484f52..7885c1bdea10c2edfd0b77625998f91f0b0cf7f4 100644 (file)
--- a/js/libs/fluidbook/fluidbook.zoom.js
+++ b/js/libs/fluidbook/fluidbook.zoom.js
@@ -94,8 +94,20 @@ FluidbookZoom.prototype = {
         this.transition = transition;
     },
 
-    resetZoom: function () {
+    resetZoom: function (callback) {
+
+        if (this.zoom === 1) {
+            if(callback){
+                callback();
+            }
+            return;
+        }
         this.setZoom(1, -1);
+        if(callback) {
+            setTimeout(function () {
+                callback();
+            }, 350);
+        }
     },
 
     setOriginPct: function (x, y, force, inertia) {