From ba5dead05f69dc32328425e0446847f81b62ad24 Mon Sep 17 00:00:00 2001
From: Vincent Vanwaelscappel <vincent@cubedesigners.com>
Date: Thu, 25 Oct 2018 19:08:21 +0200
Subject: [PATCH] wip #2312 @1

---
 js/libs/fluidbook/fluidbook.js                 |  1 -
 js/libs/fluidbook/fluidbook.pagetransitions.js |  9 ++++++++-
 js/libs/fluidbook/fluidbook.zoom.js            | 14 +++++++++++++-
 3 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/js/libs/fluidbook/fluidbook.js b/js/libs/fluidbook/fluidbook.js
index a2d99b31..a8ad7e8e 100644
--- 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 39671661..13504ec7 100644
--- 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 e89a9efb..7885c1bd 100644
--- 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) {
-- 
2.39.5