From e27d84ae39a959347bd83659e0912094836479cd Mon Sep 17 00:00:00 2001 From: Vincent Vanwaelscappel Date: Tue, 11 Dec 2018 16:09:19 +0100 Subject: [PATCH] fix #2309 @0.5 --- js/libs/fluidbook/fluidbook.support.js | 8 +------- js/widget.js | 5 ++--- style/fluidbook.less | 5 ----- 3 files changed, 3 insertions(+), 15 deletions(-) diff --git a/js/libs/fluidbook/fluidbook.support.js b/js/libs/fluidbook/fluidbook.support.js index 0aa4d584..7f9dea57 100644 --- 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 8da9d96c..a330f2e6 100644 --- 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 61416369..9072a1aa 100644 --- 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; - } } } -- 2.39.5