From: Vincent Vanwaelscappel Date: Fri, 23 Nov 2018 15:08:27 +0000 (+0100) Subject: wip #2365 @0.5 X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=574dc1fc5ef45352eb9a05abecd2679ebc83968f;p=fluidbook-html5.git wip #2365 @0.5 --- diff --git a/js/libs/fluidbook/fluidbook.pagetransitions.js b/js/libs/fluidbook/fluidbook.pagetransitions.js index 12408dee..2b26303d 100644 --- a/js/libs/fluidbook/fluidbook.pagetransitions.js +++ b/js/libs/fluidbook/fluidbook.pagetransitions.js @@ -30,7 +30,7 @@ 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') { + 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); @@ -41,12 +41,12 @@ FluidbookPageTransition.prototype = { return this.pageTransition2DPortrait(pageNr); } - if ((!this.fluidbook.support.transitions3d && !this.fluidbook.support.transitions3dacc) || this.fluidbook.datas.mobileTransitions == 'slide') { + 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) { + if (this.fluidbook.support.transitions3dacc && this.fluidbook.datas.mobileTransitions === 'flip3d') { this.fluidbook.zoom.resetZoom(function () { return $this.pageTransition3DFlip(pageNr); }); @@ -190,7 +190,7 @@ FluidbookPageTransition.prototype = { }, centerBookEnabled: function () { - return false && !!this.fluidbook.datas.centerBook && !this.fluidbook.displayOnePage && $('.tabslink').length === 0; + return false && !!this.fluidbook.datas.centerBook && !this.fluidbook.displayOnePage && $('.tabslink').length === 0; }, centerBook: function (center, animationDuration) {