From: Vincent Vanwaelscappel <vincent@cubedesigners.com>
Date: Fri, 10 May 2019 12:47:35 +0000 (+0200)
Subject: fix #2712 @0.5
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=257cdd138980f4e80cb1c0a59754f45e62f3b9f6;p=fluidbook-html5.git

fix #2712 @0.5
---

diff --git a/js/libs/fluidbook/fluidbook.loader.js b/js/libs/fluidbook/fluidbook.loader.js
index 6526f36a..8c7657d0 100644
--- a/js/libs/fluidbook/fluidbook.loader.js
+++ b/js/libs/fluidbook/fluidbook.loader.js
@@ -246,16 +246,17 @@ FluidbookLoader.prototype = {
         var leftPage = pages[0];
         var rightPage = pages[1];
 
-        if (!immediate) {
-            this.loadLeftPage(leftPage, $(doublePage), function () {
-                $this.loadRightPage(rightPage, $(doublePage), callback);
-            });
-        } else {
+        if (immediate) {
             this.loadLeftPage(leftPage, $(doublePage), function () {
             });
             this.loadRightPage(rightPage, $(doublePage), function () {
             });
             callback();
+
+        } else {
+            this.loadLeftPage(leftPage, $(doublePage), function () {
+                $this.loadRightPage(rightPage, $(doublePage), callback);
+            });
         }
     },
     loadPage: function (pageNr, doublePage, position, callback) {
diff --git a/js/libs/fluidbook/fluidbook.mobilefirst.js b/js/libs/fluidbook/fluidbook.mobilefirst.js
index f112daa1..4d42d2af 100644
--- a/js/libs/fluidbook/fluidbook.mobilefirst.js
+++ b/js/libs/fluidbook/fluidbook.mobilefirst.js
@@ -42,16 +42,18 @@ FluidbookMobileFirst.prototype = {
         }
     },
 
-    triggerTransition: function (page) {
-        this.fluidbook.pagetransitions.getTurningPages(page);
-    },
-
     beforeTransition: function (page) {
         $('#pages .mf-nav').css({opacity: 0});
         var $this = this;
         var dimensions = this.fluidbook.loader.getPageDimensions(page);
         var max = Math.max(dimensions.height, $("#currentDoublePage").outerHeight());
-        $("#nextDoublePage .page, #nextDoublePage").css({
+
+        var selector = "#nextDoublePage .page, #nextDoublePage";
+        if ($("#nextDoublePage").length === 0) {
+            selector = '#currentDoublePage .page,#currentDoublePage';
+        }
+
+        $(selector).css({
             height: dimensions.height,
             maxHeight: dimensions.height
         });
diff --git a/js/libs/fluidbook/fluidbook.pagetransitions.js b/js/libs/fluidbook/fluidbook.pagetransitions.js
index 2b8de5d7..1e50fa56 100644
--- a/js/libs/fluidbook/fluidbook.pagetransitions.js
+++ b/js/libs/fluidbook/fluidbook.pagetransitions.js
@@ -339,11 +339,6 @@ FluidbookPageTransition.prototype = {
     },
     pageTransition2DPortrait: function (pageNr) {
         this.transitionning = true;
-
-        if (this.fluidbook.mobilefirst.enabled) {
-            this.fluidbook.mobilefirst.triggerTransition(pageNr);
-        }
-
         var $this = this;
         var turning = this.getTurningPages(pageNr);
         $("#pages").append('<div id="nextDoublePage" class="doublePage _2d axis_' + this.transitionAxis + ' ' + turning.nextFromClass + '"></div>');
@@ -374,6 +369,7 @@ FluidbookPageTransition.prototype = {
     },
     pageTransition1D: function (pageNr) {
         var page = pageNr;
+
         var doublePage = $("#currentDoublePage");
         var $this = this;
         if (this.fluidbook.displayOnePage) {