From c70c8f2f4c8c0f677216cb74e448c3c7646ec01e Mon Sep 17 00:00:00 2001 From: Vincent Vanwaelscappel Date: Thu, 25 Oct 2018 16:13:30 +0200 Subject: [PATCH] fix #2310 @4 --- js/libs/fluidbook/fluidbook.loader.js | 1 - js/libs/fluidbook/fluidbook.pagetransitions.js | 10 +++++++--- js/libs/fluidbook/fluidbook.resize.js | 4 ++-- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/js/libs/fluidbook/fluidbook.loader.js b/js/libs/fluidbook/fluidbook.loader.js index 6a5ffdb8..75e0955c 100644 --- a/js/libs/fluidbook/fluidbook.loader.js +++ b/js/libs/fluidbook/fluidbook.loader.js @@ -131,7 +131,6 @@ FluidbookLoader.prototype = { }); }, - preloadAround: function (page) { if (this.numPreload == 0) { this.cleanPreloaded(); diff --git a/js/libs/fluidbook/fluidbook.pagetransitions.js b/js/libs/fluidbook/fluidbook.pagetransitions.js index 47d5ffcb..09a37c63 100644 --- a/js/libs/fluidbook/fluidbook.pagetransitions.js +++ b/js/libs/fluidbook/fluidbook.pagetransitions.js @@ -11,7 +11,6 @@ FluidbookPageTransition.prototype = { }, pageTransition: function (pageNr) { - if (this.fluidbook.pad.enabled) { this.transitionAxis = this.fluidbook.pad.getTransitionAxis(this.fluidbook.currentPage, page); } else { @@ -29,7 +28,8 @@ FluidbookPageTransition.prototype = { } } pageNr = this.fluidbook.normalizePage(pageNr); - if (pageNr == this.fluidbook.normalizePage(this.fluidbook.currentPage) || this.fluidbook.currentPage == -1 || !this.fluidbook.support.transitions2d || this.fluidbook.datas.mobileTransitions == 'none') { + 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; return this.pageTransition1D(pageNr); } @@ -282,7 +282,11 @@ FluidbookPageTransition.prototype = { if (d == undefined) { d = 1; } - $(this.fluidbook).trigger('fluidbook.page.change.start', [page, {transition: d, page: page, turningPages: turning.flip}]); + $(this.fluidbook).trigger('fluidbook.page.change.start', [page, { + transition: d, + page: page, + turningPages: turning.flip + }]); this.fluidbook.tooltip.hideTooltip(); $(".axis_y").removeClass('axis_y'); $(".axis_x").removeClass('axis_x'); diff --git a/js/libs/fluidbook/fluidbook.resize.js b/js/libs/fluidbook/fluidbook.resize.js index 2b989f21..ee6eabf0 100644 --- a/js/libs/fluidbook/fluidbook.resize.js +++ b/js/libs/fluidbook/fluidbook.resize.js @@ -376,8 +376,8 @@ FluidbookResize.prototype = { if (changeOrientation) { $(this.fluidbook).trigger('fluidbook.resize.beforeOrientationChange'); this.fluidbook.zoom.resetZoom(); - if(!this.fluidbook.firstTransition) { - this.fluidbook.pageTransition(); + if (!this.fluidbook.firstTransition) { + this.fluidbook.pagetransitions.pageTransition(); } $(this.fluidbook).trigger('fluidbook.resize.orientation', {orientation: this.orientation}); if (this.fluidbook.support.android) { -- 2.39.5