wait #5262 @1

diff --git a/js/libs/fluidbook/fluidbook.cart.js b/js/libs/fluidbook/fluidbook.cart.js
index d4b2541d79cdbaabb1de08391fb174fa005d768f..ec8d29ed48652cc2102dc993ae9969b1bb77b5b5 100644 (file)
--- a/js/libs/fluidbook/fluidbook.cart.js
+++ b/js/libs/fluidbook/fluidbook.cart.js
@@ -83,9 +83,13 @@ FluidbookCart.prototype = {
             $('a[data-cart-ref]').each(function () {
                 var c = [];
                 var haveMinus = true;
-                if ($(this).data('cart-ref').indexOf('list_') === 0) {
-                    c.push('no-minus');
-                    haveMinus = false;
+                try {
+                    if ($(this).data('cart-ref').indexOf('list_') === 0) {
+                        c.push('no-minus');
+                        haveMinus = false;
+                    }
+                }catch (e){
+
                 }
                 var size = 2;
                 if ($(this).outerWidth() < 200) {

diff --git a/js/libs/fluidbook/fluidbook.pagetransitions.js b/js/libs/fluidbook/fluidbook.pagetransitions.js
index 42c0684280dbef5d527a8ee0b144dd9caa4191d6..699dc5b63c2abd45e7b92e7940e3826cc87023de 100644 (file)
--- a/js/libs/fluidbook/fluidbook.pagetransitions.js
+++ b/js/libs/fluidbook/fluidbook.pagetransitions.js
@@ -31,8 +31,10 @@ FluidbookPageTransition.prototype = {
             return 0;
         } else if (type === 'flip3d') {
             return this.flip3d.animationTime;
-        } else {
+        } else if (type === 'flipcss' || type === 'flip') {
             return parseFloat(this.fluidbook.settings.mobileTransitionDuration);
+        } else {
+            return parseFloat(this.fluidbook.settings.mobileTransitionDurationSlide);
         }
     },
 
@@ -478,7 +480,7 @@ FluidbookPageTransition.prototype = {
 
         this.fluidbook.hideLoader();
         this.fluidbook.hideUnnecessaryButtons(page);
-        var animationDuration = transition < 1 ? 0 : parseFloat(this.fluidbook.settings.mobileTransitionDuration);
+        var animationDuration=this.getTransitionDuration(page);
         this.fluidbook.updateShadows(page, animationDuration);
         this.centerBook(turning.center, animationDuration);
         $("#pagesnumbers").addClass('hidden');

diff --git a/style/fluidbook.less b/style/fluidbook.less
index 4e6df045151d7f992c2ea9c3fd7f25b70a09788b..7d71268173192e638e43aed298d4d77ee483ee7b 100644 (file)
--- a/style/fluidbook.less
+++ b/style/fluidbook.less
@@ -2428,7 +2428,11 @@ ul.chapters.shareList a.level0 .svg-icon {
 /*  Transitions */
 
 .doublePage {
-  &._2d, &._3d, &._fade {
+  &._2d, &._fade {
+    .page-transition-slide(1);
+  }
+
+  &._3d {
     .page-transition(1);
   }
 }

diff --git a/style/mixins.less b/style/mixins.less
index ce4e5a02bb05857a9e60f2ebaa0e8b88f96a0e2a..f60a929c7edac3772368bf57c42f26aadcbe5bfb 100644 (file)
--- a/style/mixins.less
+++ b/style/mixins.less
@@ -17,6 +17,10 @@
   .prop-transition(all, @factor);
 }
 
+.page-transition-slide(@factor) {
+  .prop-transition-slide(all, @factor);
+}
+
 .prop-transition(@property,@factor) {
   -moz-transition: @property unit(@page-transition-duration*@factor, s) ease-in-out;
   -webkit-transition: @property unit(@page-transition-duration*@factor, s) ease-in-out;
@@ -25,6 +29,14 @@
   transition: @property unit(@page-transition-duration*@factor, s) ease-in-out;
 }
 
+.prop-transition-slide(@property,@factor) {
+  -moz-transition: @property unit(@page-transition-slide-duration*@factor, s) ease-in-out;
+  -webkit-transition: @property unit(@page-transition-slide-duration*@factor, s) ease-in-out;
+  -ms-transition: @property unit(@page-transition-slide-duration*@factor, s) ease-in-out;
+  -o-transition: @property unit(@page-transition-slide-duration*@factor, s) ease-in-out;
+  transition: @property unit(@page-transition-slide-duration*@factor, s) ease-in-out;
+}
+
 .menu-color(@base-color) {
   @green: max(45, min(255 - 45, green(@base-color)));
   @red: max(45, min(255 - 45, red(@base-color)));