From: Vincent Vanwaelscappel Date: Fri, 8 Jan 2021 16:09:25 +0000 (+0100) Subject: wait #4178 @1.5 X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=8515a2e5495979256dea6f4f0d7f37518e59335e;p=fluidbook-html5.git wait #4178 @1.5 --- diff --git a/js/libs/fluidbook/fluidbook.pagetransitions.js b/js/libs/fluidbook/fluidbook.pagetransitions.js index 33dc4b3e..407cc206 100644 --- a/js/libs/fluidbook/fluidbook.pagetransitions.js +++ b/js/libs/fluidbook/fluidbook.pagetransitions.js @@ -348,11 +348,12 @@ FluidbookPageTransition.prototype = { this.pauseNetworkDuringPagesPreload(); this.fluidbook.loader.preloadPagesBeforeTransition(turning.end, function () { $this.fluidbook.loader.setContentsInDoublePage(doublePage, turning.end, true, function () { + $("#shade").addClass('transition'); $this.pauseNetworkDuringTransition(pageNr); $this.beforeTransition(pageNr, 2, turning); $("#currentDoublePage").addClass('_2d').addClass('axis_' + $this.transitionAxis).addClass(turning.currentToClass); $(doublePage).removeClass(turning.nextFromClass).one($this.fluidbook.support.getTransitionEndEvent(), function (event) { - if ($this.transitionning == false) { + if ($this.transitionning === false) { return; } $("#currentDoublePage").remove(); @@ -541,6 +542,7 @@ FluidbookPageTransition.prototype = { $("#shade .right").show(); } + $("#shade").removeClass('transition'); setTimeout(function () { $this.transitionning = false; diff --git a/style/fluidbook.less b/style/fluidbook.less index 88237963..639f02f7 100644 --- a/style/fluidbook.less +++ b/style/fluidbook.less @@ -398,11 +398,11 @@ body, html { .doublePage { &._2d.axis_x { &.next { - transform: translate3d(@book-page-width-double, 0, 0, 0); + transform: translate3d(@book-page-width-double, 0, 0); } &.prev { - transform: translate3d(-@book-page-width-double, 0, 0, 0); + transform: translate3d(-@book-page-width-double, 0, 0); } } } @@ -515,6 +515,11 @@ body, html { z-index: 5; pointer-events: none; opacity: @page-shade-opacity; + transition: opacity 100ms; + + &.transition { + opacity: 0; + } .portrait & { display: none; @@ -759,7 +764,7 @@ body, html { position: absolute; z-index: 11; direction: ltr; - + s &.animate { transition: all @zoomtransition ease-out; }