]> _ Git - fluidbook-html5.git/commitdiff
wip #2365 @0.5
authorVincent Vanwaelscappel <vincent@cubedesigners.com>
Fri, 23 Nov 2018 15:08:27 +0000 (16:08 +0100)
committerVincent Vanwaelscappel <vincent@cubedesigners.com>
Fri, 23 Nov 2018 15:08:27 +0000 (16:08 +0100)
js/libs/fluidbook/fluidbook.pagetransitions.js

index 12408dee760eb43cde8cd84b8e6eea1c49385061..2b26303d336932cf1c39207c2fd4297b42cde451 100644 (file)
@@ -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) {