From: Vincent Vanwaelscappel Date: Fri, 11 Mar 2022 16:30:12 +0000 (+0100) Subject: wait #5159 @0.5 X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=87326bf7deeac6c363917a0ca475367c26e0da41;p=fluidbook-html5.git wait #5159 @0.5 --- diff --git a/js/libs/fluidbook/fluidbook.links.js b/js/libs/fluidbook/fluidbook.links.js index 54a6c1c0..bb9ef634 100644 --- a/js/libs/fluidbook/fluidbook.links.js +++ b/js/libs/fluidbook/fluidbook.links.js @@ -588,7 +588,7 @@ FluidbookLinks.prototype = { to.repeat = parseInt(animation.repeat); var css = {}; - animation.ease = this.fixEase(); + animation.ease = this.fixEase(animation.ease); if (animation.rotate !== undefined) { animation.rotation = animation.rotate; } @@ -828,6 +828,7 @@ FluidbookLinks.prototype = { } if (usegsap) { to.duration = duration; + console.log(to); gsap.fromTo(linkElement, from, to); } this.fluidbook.networkControl.pause((to.delay + duration + 0.5) * 1000); @@ -842,6 +843,7 @@ FluidbookLinks.prototype = { ease = 'none'; } ease = ease.replace('.ease', '.'); + ease = ease.replace('inout', 'inOut'); return ease; }, diff --git a/js/libs/fluidbook/fluidbook.pagetransitions.js b/js/libs/fluidbook/fluidbook.pagetransitions.js index add5ff4a..42c06842 100644 --- a/js/libs/fluidbook/fluidbook.pagetransitions.js +++ b/js/libs/fluidbook/fluidbook.pagetransitions.js @@ -372,7 +372,6 @@ FluidbookPageTransition.prototype = { this.transitionning = true; var $this = this; var turning = this.getTurningPages(pageNr); - console.log(turning); $("#pages").append(''); var doublePage = $("#nextDoublePage"); if (this.fluidbook.displayOnePage) { diff --git a/js/libs/fluidbook/fluidbook.touch.js b/js/libs/fluidbook/fluidbook.touch.js index 4cdd3120..52a54ed4 100644 --- a/js/libs/fluidbook/fluidbook.touch.js +++ b/js/libs/fluidbook/fluidbook.touch.js @@ -65,7 +65,8 @@ FluidbookTouch.prototype = { } var options = { - domEvents: this.fluidbook.mobilefirst.enabled, touchAction: touchAction + domEvents: this.fluidbook.mobilefirst.enabled, + touchAction: touchAction }; Hammer.defaults.domEvents = options.domEvents; Hammer.defaults.touchAction = options.touchAction; @@ -141,6 +142,7 @@ FluidbookTouch.prototype = { }); hmf.on('panstart', function (event) { + console.log(event); if ($this.drag(event, 'start')) { event.preventDefault(); }