(no commit message)

diff --git a/js/libs/fluidbook/fluidbook.js b/js/libs/fluidbook/fluidbook.js
index e5ec71f6430be16f8e2b51de78d77c68985c11a1..a3b4e3d599f1cbf56c6489a88bb43015a0a7eba6 100644 (file)
--- a/js/libs/fluidbook/fluidbook.js
+++ b/js/libs/fluidbook/fluidbook.js
@@ -359,37 +359,21 @@ Fluidbook.prototype = {
                        }\r
                }\r
                pageNr = this.normalizePage(pageNr);\r
-               if (pageNr == this.normalizePage(this.currentPage) || this.currentPage == -1) {\r
-                       // No page change, just reload\r
-                       this.pageTransition1D(pageNr);\r
-                       return;\r
-               }\r
-               if (!this.displayOnePage && this.datas.mobileTransitions == 'flip') {\r
-                       if (this.support.transitions3d) {\r
-                               this.pageTransition3D(pageNr);\r
-                       } else if (this.support.transitions2d) {\r
-                               this.pageTransition2D(pageNr);\r
-                       } else {\r
-                               this.pageTransition1D(pageNr);\r
-                       }\r
-               } else if ((this.displayOnePage && this.datas.mobileTransitions == 'flip')) {\r
-                       if (this.support.transitions2d) {\r
-                               this.pageTransition2DPortrait(pageNr);\r
-                       } else {\r
-                               this.pageTransition1D(pageNr);\r
-                       }\r
-               } else if (this.datas.mobileTransitions == 'slide') {\r
-                       if (this.support.transitions2d) {\r
-                               this.pageTransition2D(pageNr);\r
-                       } else {\r
-                               this.pageTransition1D(pageNr);\r
-                       }\r
 \r
 \r
+               if (pageNr == this.normalizePage(this.currentPage) || this.currentPage == -1 || !this.support.transitions2d || this.datas.mobileTransitions == 'none') {\r
+                       return this.pageTransition1D(pageNr);\r
                }\r
-               else {\r
-                       this.pageTransition1D(pageNr);\r
+\r
+               if (this.displayOnePage) {\r
+                       return this.pageTransition2DPortrait(pageNr);\r
+               }\r
+\r
+               if (!this.support.transitions3d || this.datas.mobileTransitions == 'slide') {\r
+                       return this.pageTransition2D(pageNr);\r
                }\r
+\r
+               return this.pageTransition3D(pageNr);\r
        },\r
        pageTransition3D: function(pageNr) {\r
 \r
@@ -478,7 +462,12 @@ Fluidbook.prototype = {
                                res.flat = [res.currentLeft, newPage];\r
                                res.flip = [newPage + 1, res.currentRight];\r
                        }\r
-                       res.end = [newPage + 1, newPage];\r
+\r
+                       if (this.displayOnePage) {\r
+                               res.end = [newPage, newPage + 1];\r
+                       } else {\r
+                               res.end = [newPage + 1, newPage];\r
+                       }\r
                }\r
                res.loading = [res.currentLeft, res.currentRight];\r
                return JSON.parse(JSON.stringify(res));\r
@@ -612,6 +601,7 @@ Fluidbook.prototype = {
                        this.hidePage('right');\r
                }\r
                var turning = this.getTurningPages(pageNr);\r
+               fb(turning);\r
                this.beforeTransition(pageNr);\r
                this.loader.setContentsInDoublePage(doublePage, turning.end, true, function() {\r
                        $this.afterTransition(page);\r
@@ -671,11 +661,10 @@ Fluidbook.prototype = {
 \r
                var min, max;\r
 \r
-\r
                if (page > 0) {\r
                        min = this.physicalToVirtual(page);\r
                } else {\r
-                       min;\r
+                       min = '';\r
                }\r
 \r
                page++;\r
@@ -686,7 +675,7 @@ Fluidbook.prototype = {
                }\r
 \r
 \r
-               if (this.displayOnePage || this.l10n.dir == 'ltr') {\r
+               if (this.l10n.dir == 'ltr') {\r
                        $("#pagesnumbers .left").html(min);\r
                        $("#pagesnumbers .right").html(max);\r
                } else {\r

diff --git a/js/libs/fluidbook/fluidbook.support.js b/js/libs/fluidbook/fluidbook.support.js
index d5b923645cc1ed0a0b261fec42070477c57722d7..5f59b37687bdd6ce214f07667a3c32421fc6f5e0 100644 (file)
--- a/js/libs/fluidbook/fluidbook.support.js
+++ b/js/libs/fluidbook/fluidbook.support.js
@@ -5,8 +5,9 @@ function FluidbookSupport(fluidbook) {
        this.android3 = this.android && this.userAgent.search(/android 3/i) > -1;
        this.iOS = this.userAgent.search(/ipad/i) > -1 || this.userAgent.search(/iphone/i) > -1 || this.userAgent.search(/ipod/i) > -1;
 
-       this.transitions3d = Modernizr.csstransforms3d && Modernizr.csstransitions && Modernizr.csstransformspreserve3d;
        this.transitions2d = Modernizr.csstransforms && Modernizr.csstransitions;
+       this.transitions3d = Modernizr.csstransforms3d && Modernizr.csstransformspreserve3d && this.transitions2d;
+
        this.transitionendevent = null;
        if (Modernizr.mq('(-webkit-min-device-pixel-ratio: 2), (min-resolution: 192dpi)')) {
                this.resolution = this.fluidbook.datas.retinaResolution;
@@ -76,8 +77,8 @@ FluidbookSupport.prototype = {
                return t;
        },
        initEvents: function() {
-               
-               var $this=this;
+
+               var $this = this;
 
                if (!this.isMobile) {
                        $(window).resize(function() {
@@ -115,9 +116,9 @@ FluidbookSupport.prototype = {
                try {
                        if (this.fluidbook.pad && this.fluidbook.pad.enabled) {
                                return 0;
-                       }else if(this.fluidbook.datas.mobileNavigationType=='landscape'){
+                       } else if (this.fluidbook.datas.mobileNavigationType == 'landscape') {
                                return 90;
-                       }else if(this.fluidbook.datas.mobileNavigationType=='portrait'){
+                       } else if (this.fluidbook.datas.mobileNavigationType == 'portrait') {
                                return 0;
                        }
                } catch (err) {

diff --git a/js/libs/fluidbook/fluidbook.touch.js b/js/libs/fluidbook/fluidbook.touch.js
index 0d5372f4f3eca25d969ae8dfd32f34267f1f3191..b9b17c17c8ebf9e4cd4b9ff64c6917154244dd4c 100644 (file)
--- a/js/libs/fluidbook/fluidbook.touch.js
+++ b/js/libs/fluidbook/fluidbook.touch.js
@@ -53,7 +53,7 @@ FluidbookTouch.prototype = {
                return this._move(e.screenX, e.screenY);
        },
        allowMove: function() {
-               return !(this.fluidbook.support.getZoomLevel() <= 1  && !this.fluidbook.viewMode());
+               return !(this.fluidbook.support.getZoomLevel() <= 1 && !this.fluidbook.viewMode());
        },
        allowSlide: function() {
                return !(this.gesturing || this.fluidbook.support.getZoomLevel() > 1 || this.fluidbook.viewMode() || this.fluidbook.help.isVisible());
@@ -131,10 +131,19 @@ FluidbookTouch.prototype = {
                        }
                        if (this.allowSlide()) {
                                if (this.offsetX < -this.triggerOffset) {
-                                       this.fluidbook.goNextPage();
+                                       if (this.fluidbook.l10n.dir == 'ltr') {
+                                               this.fluidbook.goNextPage();
+                                       } else {
+                                               this.fluidbook.goPreviousPage();
+                                       }
+
                                        return true;
                                } else if (this.offsetX > this.triggerOffset) {
-                                       this.fluidbook.goPreviousPage();
+                                       if (this.fluidbook.l10n.dir == 'ltr') {
+                                               this.fluidbook.goPreviousPage();
+                                       } else {
+                                               this.fluidbook.goNextPage();
+                                       }
                                        return true;
                                }
                        }