From dde76e8ad8ec5f681c593cea13d034b9e4e02c39 Mon Sep 17 00:00:00 2001 From: Vincent Vanwaelscappel Date: Fri, 18 Oct 2019 20:06:21 +0200 Subject: [PATCH] fix #3137 @1 --- js/libs/fluidbook/fluidbook.js | 2 ++ js/libs/fluidbook/fluidbook.pagetransitions.js | 6 ++++-- js/libs/fluidbook/fluidbook.resize.js | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/js/libs/fluidbook/fluidbook.js b/js/libs/fluidbook/fluidbook.js index fe73442a..c01e4c34 100644 --- a/js/libs/fluidbook/fluidbook.js +++ b/js/libs/fluidbook/fluidbook.js @@ -98,6 +98,7 @@ Fluidbook.prototype = { } $('html').addClass(this.datas.mobileLVersion); this.currentPage = -1; + this.currentPageURL = -1; this.contentlock.init(); @@ -458,6 +459,7 @@ Fluidbook.prototype = { if (isNaN(page) || page == undefined) { return this.setCurrentPage('1'); } + this.currentPageURL = page; if (page !== $this.currentPage) { $($this).trigger('fluidbook.page.navigation', [page]); diff --git a/js/libs/fluidbook/fluidbook.pagetransitions.js b/js/libs/fluidbook/fluidbook.pagetransitions.js index ae03c081..342dc578 100644 --- a/js/libs/fluidbook/fluidbook.pagetransitions.js +++ b/js/libs/fluidbook/fluidbook.pagetransitions.js @@ -72,7 +72,7 @@ FluidbookPageTransition.prototype = { }, - pageTransition: function (pageNr) { + pageTransition: function (pageNr,transitionType) { var $this = this; if (this.fluidbook.pad.enabled) { this.transitionAxis = this.fluidbook.pad.getTransitionAxis(this.fluidbook.currentPage, page); @@ -84,7 +84,9 @@ FluidbookPageTransition.prototype = { this.fluidbook.tooltip.hideTooltip(); pageNr = this.normalizeTransitionPageNr(pageNr); - var transitionType = this.getTransitionType(pageNr); + if(transitionType===undefined) { + transitionType = this.getTransitionType(pageNr); + } if (this.fluidbook.firstTransition || transitionType === 'immediate') { this.fluidbook.firstTransition = false; diff --git a/js/libs/fluidbook/fluidbook.resize.js b/js/libs/fluidbook/fluidbook.resize.js index 11276deb..fe843562 100644 --- a/js/libs/fluidbook/fluidbook.resize.js +++ b/js/libs/fluidbook/fluidbook.resize.js @@ -441,7 +441,7 @@ FluidbookResize.prototype = { $(this.fluidbook).trigger('fluidbook.resize.beforeOrientationChange'); this.fluidbook.zoom.resetZoom(); if (!this.fluidbook.firstTransition) { - this.fluidbook.pagetransitions.pageTransition(); + this.fluidbook.pagetransitions.pageTransition(this.fluidbook.currentPageURL, 'immediate'); } $(this.fluidbook).trigger('fluidbook.resize.orientation', {orientation: this.orientation}); if (this.fluidbook.support.android) { -- 2.39.5