From: Vincent Vanwaelscappel <vincent@cubedesigners.com>
Date: Wed, 28 Jun 2017 17:25:21 +0000 (+0200)
Subject: fix #1468 @0.5
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=5e38cda572ede82c1e0c2be00751b5cb33d1d4bb;p=fluidbook-html5.git

fix #1468 @0.5
---

diff --git a/js/libs/fluidbook/fluidbook.zoom.js b/js/libs/fluidbook/fluidbook.zoom.js
index 80733010..341efd33 100644
--- a/js/libs/fluidbook/fluidbook.zoom.js
+++ b/js/libs/fluidbook/fluidbook.zoom.js
@@ -49,14 +49,16 @@ FluidbookZoom.prototype = {
         if (this.zoom == zoom) {
             return;
         }
-        if (this.transition) {
+        if (!this.transition) {
             if (direction == 1) {
-                if (zoom < 1.5) {
+                if (zoom < 1.25) {
                     zoom = 2;
+                    this.setTransition(true);
                 }
             } else if (direction == -1) {
-                if (zoom < 1.5) {
+                if (zoom < 1.25) {
                     zoom = 1;
+                    this.setTransition(true);
                 }
             }
         }