fix #2309 @0.5

diff --git a/js/libs/fluidbook/fluidbook.support.js b/js/libs/fluidbook/fluidbook.support.js
index 0aa4d58482b31d1da1d9edaf5d6002991ea8e82b..7f9dea5771c3585dac7cebf7cbc6d44faf5ef344 100644 (file)
--- a/js/libs/fluidbook/fluidbook.support.js
+++ b/js/libs/fluidbook/fluidbook.support.js
@@ -64,13 +64,7 @@ function FluidbookSupport(fluidbook) {
 
 FluidbookSupport.prototype = {
     getTransitionEndEvent: function (all) {
-        if (all == undefined) {
-            all = false;
-        }
-        if (!all) {
-            return this.transitionEndEvent;
-        }
-        return "transitionEnd";
+        return "transitionend";
     },
     hasNetwork: function () {
         if (navigator.onLine != undefined) {

diff --git a/js/widget.js b/js/widget.js
index 8da9d96c9c1e2be438958ebf4e3c031c6e7f3771..a330f2e63b8ab45438844bc697314b279fa095e3 100644 (file)
--- a/js/widget.js
+++ b/js/widget.js
@@ -48,7 +48,7 @@ $(function () {
         this.bookHeight;
         this.init();
 
-        this.transitionendevents = ['transitionend'].join(' ');
+        this.transitionendevents = 'transitionend';
     }
 
     FluidbookWidget.prototype = {
@@ -211,8 +211,7 @@ $(function () {
                             $this.gotoPage(page, false)
                         });
                     }
-                }
-                else if (this.transition == '3d') {
+                } else if (this.transition == '3d') {
                     $("#widget").css('overflow', 'visible');
                     var nextFromClass;
                     if (this.dir == 1) {

diff --git a/style/fluidbook.less b/style/fluidbook.less
index 6141636940c2bcbc3b15a6ca743634b28eaf16c9..9072a1aa382913eb6d3338ab372a84b975f1acc6 100644 (file)
--- a/style/fluidbook.less
+++ b/style/fluidbook.less
@@ -583,11 +583,6 @@ body, html {
                                background-image: url("../images/edges/edge-right-middle.png");
                        }
                }
-
-               .ios & {
-                       transition-property: none !important;
-                       transition-duration:0ms !important;
-               }
        }
 }