fix #2968 @1.5

diff --git a/js/libs/fluidbook/fluidbook.mobilefirst.js b/js/libs/fluidbook/fluidbook.mobilefirst.js
index ca4eea0a15256c032a0eed226ac21ae62aaaf2e8..d59582dbda5efbecf8ff56a2762ebdfae653ce00 100644 (file)
--- a/js/libs/fluidbook/fluidbook.mobilefirst.js
+++ b/js/libs/fluidbook/fluidbook.mobilefirst.js
@@ -96,14 +96,14 @@ FluidbookMobileFirst.prototype = {
         });
 
         $("#pages,#fluidbook").css({height: max, maxHeight: max});
-
+        var scrollTo = $("#scroll").scrollTop();
+        $("#scroll").scrollTop(0).css('transform', 'translateY(' + (-scrollTo) + 'px)').addClass('gototop');
         setTimeout(function () {
-            TweenLite.to("#scroll", $this.fluidbook.pagetransitions.getTransitionDuration(page), {
-                scrollTo: 0,
-                ease: Power2.easeInOut
-            });
+            $("#scroll").addClass('animate').css('transform', 'translateY(0px)');
+            setTimeout(function () {
+                $("#scroll").removeClass('gototop').removeClass('animate').css('transform', '');
+            }, $this.fluidbook.pagetransitions.getTransitionDuration(page)*1000);
         }, 10);
-
     },
 
     afterTransition: function (page) {

diff --git a/js/libs/fluidbook/fluidbook.pagetransitions.js b/js/libs/fluidbook/fluidbook.pagetransitions.js
index bbfbbaa6e970a1f7328e63de11d95a645f08774e..ae03c081cbe8b61a5a698cd1649cb2eb3ec49ac3 100644 (file)
--- a/js/libs/fluidbook/fluidbook.pagetransitions.js
+++ b/js/libs/fluidbook/fluidbook.pagetransitions.js
@@ -26,6 +26,7 @@ FluidbookPageTransition.prototype = {
 
     getTransitionDuration: function (pageNr) {
         var type = this.getTransitionType(pageNr);
+        var f= 0;
         if (type === 'immediate') {
             return 0;
         } else if (type === 'flip3d') {

diff --git a/style/fluidbook.less b/style/fluidbook.less
index 56af61a03ecf9752922e12e73a1419e8a664bca1..0046258f43f625283170c95cd90535583daf266e 100644 (file)
--- a/style/fluidbook.less
+++ b/style/fluidbook.less
@@ -742,6 +742,15 @@ body, html {
   overflow-x: hidden;
   overflow-y: auto;
   .hidescrollbar();
+
+  &.gototop {
+    overflow-x: visible;
+    overflow-y: visible;
+  }
+
+  &.animate {
+    transition: transform unit(@page-transition-duration, s) ease-in-out;
+  }
 }
 
 /* Fluidbook */