wait #4530 @3

diff --git a/js/libs/fluidbook/fluidbook.pagetransitions.js b/js/libs/fluidbook/fluidbook.pagetransitions.js
index 407cc20630ca67e5ba05ddd33be19eb07e2a8b57..add5ff4a79d9673b340b96747381c3e88387a689 100644 (file)
--- a/js/libs/fluidbook/fluidbook.pagetransitions.js
+++ b/js/libs/fluidbook/fluidbook.pagetransitions.js
@@ -328,7 +328,7 @@ FluidbookPageTransition.prototype = {
             $(move).removeClass('animate');
         }
 
-        var $this=this;
+        var $this = this;
         var delay = this.fluidbook.support.android ? this.fluidbook.settings.mobileTransitionDuration * 1000 : 10;
         setTimeout(function () {
             move.transform({translateX: left + 'px'});
@@ -364,10 +364,15 @@ FluidbookPageTransition.prototype = {
         });
     },
 
+    pageTransitionFade: function (pageNr) {
+        return this.pageTransitionFadeOne(pageNr);
+    },
+
     pageTransitionFadeOne: function (pageNr) {
         this.transitionning = true;
         var $this = this;
         var turning = this.getTurningPages(pageNr);
+        console.log(turning);
         $("#pages").append('<div id="nextDoublePage" aria-hidden="true" class="doublePage _fade ' + turning.nextFromClass + '"></div>');
         var doublePage = $("#nextDoublePage");
         if (this.fluidbook.displayOnePage) {
@@ -381,8 +386,12 @@ FluidbookPageTransition.prototype = {
 
         this.fluidbook.loader.preloadPagesBeforeTransition(turning.end, function () {
             $this.fluidbook.loader.setContentsInDoublePage(doublePage, turning.end, true, function () {
+                $("#shade").addClass('fadetransition');
                 $this.pauseNetworkDuringTransition(pageNr);
-                $this.beforeTransition(pageNr, 2, turning);
+                $this.beforeTransition(pageNr, 1, turning);
+                if (turning.center && !$this.fluidbook.displayOnePage) {
+                    $("#currentDoublePage").css('opacity', 0);
+                }
 
                 $(doublePage).removeClass(turning.nextFromClass).one($this.fluidbook.support.getTransitionEndEvent(), function () {
                     if ($this.transitionning === false) {
@@ -470,7 +479,7 @@ FluidbookPageTransition.prototype = {
 
         this.fluidbook.hideLoader();
         this.fluidbook.hideUnnecessaryButtons(page);
-        var animationDuration = transition <= 1 ? 0 : parseFloat(this.fluidbook.settings.mobileTransitionDuration);
+        var animationDuration = transition < 1 ? 0 : parseFloat(this.fluidbook.settings.mobileTransitionDuration);
         this.fluidbook.updateShadows(page, animationDuration);
         this.centerBook(turning.center, animationDuration);
         $("#pagesnumbers").addClass('hidden');
@@ -542,7 +551,7 @@ FluidbookPageTransition.prototype = {
             $("#shade .right").show();
         }
 
-        $("#shade").removeClass('transition');
+        $("#shade").removeClass('transition').removeClass('fadetransition');
 
         setTimeout(function () {
             $this.transitionning = false;

diff --git a/style/fluidbook.less b/style/fluidbook.less
index 8fcf3e340ce0dc5ed90256cacff494c4b3dc4573..799136b786a0e254265f5980b61e88f6d4cd35cd 100644 (file)
--- a/style/fluidbook.less
+++ b/style/fluidbook.less
@@ -542,6 +542,11 @@ body, html {
     opacity: 0;
   }
 
+  &.fadetransition {
+    z-index: 12;
+  }
+
+
   .portrait & {
     display: none;
   }