wait #5159 @0.5

diff --git a/js/libs/fluidbook/fluidbook.links.js b/js/libs/fluidbook/fluidbook.links.js
index 54a6c1c085d329a9160e1169aead8b23cc66f1f8..bb9ef634baccf750c886c0e43b761d99ca7af8f0 100644 (file)
--- 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 add5ff4a79d9673b340b96747381c3e88387a689..42c0684280dbef5d527a8ee0b144dd9caa4191d6 100644 (file)
--- 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('<div id="nextDoublePage" aria-hidden="true" class="doublePage _fade ' + turning.nextFromClass + '"></div>');
         var doublePage = $("#nextDoublePage");
         if (this.fluidbook.displayOnePage) {

diff --git a/js/libs/fluidbook/fluidbook.touch.js b/js/libs/fluidbook/fluidbook.touch.js
index 4cdd3120b6bfeddecc2511b6ecdc483e916fef31..52a54ed4984b6b6a80b08608f700c89d1e35edd4 100644 (file)
--- 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();
                 }