wait #2524 @0.75

diff --git a/js/libs/fluidbook/fluidbook.js b/js/libs/fluidbook/fluidbook.js
index 5c6fc6e61bb72e7069600bc4973dad3aeafd43f3..ff44fd03d705b57a5001e252a13af06f07d5b203 100644 (file)
--- a/js/libs/fluidbook/fluidbook.js
+++ b/js/libs/fluidbook/fluidbook.js
@@ -528,13 +528,11 @@ Fluidbook.prototype = {
             animationDuration = 0;
         }
         animationDuration *= 1000;
-        var delay, duration;
+        var delay;
         if (animationDuration === 0) {
             delay = 0;
-            duration = 0;
         } else {
             delay = animationDuration;
-            duration = animationDuration * 0.3;
         }
 
 
@@ -564,26 +562,16 @@ Fluidbook.prototype = {
             s_out.push(".right:not('.hidden')");
         }
 
-        if (false && this.support.transitions2d && !this.support.iOS) {
-            var transitionIn = {transitionDuration: duration + 'ms', transitionDelay: delay + 'ms'};
-            var transitionOut = {transitionDuration: (duration * .5) + 'ms', transitionDelay: '0ms'};
-            if (s_in.length > 0) {
-                $(s).children(s_in.join(',')).css(transitionIn).removeClass('hidden');
-            }
-            if (s_out.length > 0) {
-                $(s).children(s_out.join(',')).css(transitionOut).addClass('hidden');
-            }
 
-        } else {
-            if (s_in.length > 0) {
-                setTimeout(function () {
-                    $(s).children(s_in.join(',')).removeClass('hidden');
-                }, delay);
-            }
-            if (s_out.length > 0) {
-                $(s).children(s_out.join(',')).addClass('hidden');
-            }
+        if (s_in.length > 0) {
+            setTimeout(function () {
+                $(s).children(s_in.join(',')).removeClass('hidden');
+            }, delay);
         }
+        if (s_out.length > 0) {
+            $(s).children(s_out.join(',')).addClass('hidden');
+        }
+
     },
     showAllButtons: function () {
         $("#next,#previous").addClass('help').show();

diff --git a/js/libs/fluidbook/fluidbook.pagetransitions.js b/js/libs/fluidbook/fluidbook.pagetransitions.js
index be5939637e589c897296675825fe7337b1be2cd8..2e23ba99d0aa5a89fd7b34150ebeb4e87c1f8981 100644 (file)
--- a/js/libs/fluidbook/fluidbook.pagetransitions.js
+++ b/js/libs/fluidbook/fluidbook.pagetransitions.js
@@ -389,6 +389,7 @@ FluidbookPageTransition.prototype = {
         this.fluidbook.links.initLinks();
         this.fluidbook.hideLoader();
         this.fluidbook.resetWaiters();
+        this.fluidbook.updateShadows(page, 0);
         // Clean messy stuffs
         $("#pages").removeClass('_3dtransition');
         if ($("#nextDoublePage").length > 0) {
@@ -399,7 +400,7 @@ FluidbookPageTransition.prototype = {
             $("#currentDoublePage:gt(0)").remove();
         }
         $("#nextDoublePage").remove();
-        this.transitionning = false;
+
         if (this.fluidbook.pad.enabled) {
             if (this.fluidbook.currentPage == this.fluidbook.datas.pages) {
                 $("#down").css('opacity', 0);
@@ -420,6 +421,9 @@ FluidbookPageTransition.prototype = {
             this.fluidbook.audiodescription.setupPages();
         }
 
+        setTimeout(function () {
+            $this.transitionning = false;
+        }, 10)
         $(this.fluidbook).trigger('fluidbook.page.change.end', [this.fluidbook.currentPage]);
     },