From 84fea5f3271dce95fb63b1313f8c3af384a9fa4f Mon Sep 17 00:00:00 2001 From: Vincent Vanwaelscappel Date: Tue, 3 May 2022 17:54:07 +0200 Subject: [PATCH] wait #5262 @1 --- js/libs/fluidbook/fluidbook.cart.js | 10 +++++++--- js/libs/fluidbook/fluidbook.pagetransitions.js | 6 ++++-- style/fluidbook.less | 6 +++++- style/mixins.less | 12 ++++++++++++ 4 files changed, 28 insertions(+), 6 deletions(-) diff --git a/js/libs/fluidbook/fluidbook.cart.js b/js/libs/fluidbook/fluidbook.cart.js index d4b2541d..ec8d29ed 100644 --- 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 42c06842..699dc5b6 100644 --- 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 4e6df045..7d712681 100644 --- 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 ce4e5a02..f60a929c 100644 --- 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))); -- 2.39.5