From b69fda9471da04bdef6fafe273bac21a229116bd Mon Sep 17 00:00:00 2001 From: Vincent Vanwaelscappel Date: Tue, 11 Dec 2018 12:02:08 +0100 Subject: [PATCH] try #2423 @1 --- js/libs/fluidbook/fluidbook.js | 4 +--- js/libs/fluidbook/fluidbook.links.js | 21 ++++++++++++------- js/libs/fluidbook/fluidbook.loader.js | 2 +- .../fluidbook/fluidbook.pagetransitions.js | 4 +++- style/help.less | 1 - 5 files changed, 18 insertions(+), 14 deletions(-) diff --git a/js/libs/fluidbook/fluidbook.js b/js/libs/fluidbook/fluidbook.js index f21e1067..ef219dd1 100644 --- a/js/libs/fluidbook/fluidbook.js +++ b/js/libs/fluidbook/fluidbook.js @@ -592,8 +592,6 @@ Fluidbook.prototype = { resetWaiters: function () { this.waiters = []; }, - - physicalToVirtual: function (page) { return this.datas.numerotation[page - 1]; }, @@ -954,7 +952,7 @@ Fluidbook.prototype = { pauseNetwork: function (during) { clearTimeout(this.networkPauseTimeout); var $this = this; - if (during == -1) { + if (during === -1) { this.networkPause = false; this.flushNetworkQueue(); return; diff --git a/js/libs/fluidbook/fluidbook.links.js b/js/libs/fluidbook/fluidbook.links.js index fe05c6b9..6f0ccec0 100644 --- a/js/libs/fluidbook/fluidbook.links.js +++ b/js/libs/fluidbook/fluidbook.links.js @@ -176,21 +176,26 @@ FluidbookLinks.prototype = { pageNr--; } - $("#links").removeClass('left').removeClass('right').addClass(lClass).html(this.fluidbook.datas.links[pageNr]).show(); + var links = $("#links"); + + links.removeClass('left').removeClass('right').addClass(lClass).html(this.fluidbook.datas.links[pageNr]).show(); if (this.fluidbook.datas.bookmark) { - $("#links").append(this.fluidbook.bookmarks.getBookmarkForPage(pageNr)); + links.append(this.fluidbook.bookmarks.getBookmarkForPage(pageNr)); } - $("#links").prepend('
'); - $("#links").find('.rightContainer').append($("#links").children('.link.odd')); - $("#links").find('.leftContainer').append($("#links").children('.link')); + links.prepend('
'); + links.find('.rightContainer').append(links.children('.link.odd')); + links.find('.leftContainer').append(links.children('.link')); + if (links.find('.link.multimedia iframe').length > 0) { + this.fluidbook.pauseNetwork(30000); + } if (this.lowdef) { - $("#links").find('iframe[data-ld]').each(function () { + links.find('iframe[data-ld]').each(function () { $(this).attr('src', $(this).data('ld')); }); } - $("#links").prepend('
'); + links.prepend('
'); var $this = this; if (this.fluidbook.datas.linkBlinkTime > 0 && this.fluidbook.datas.mobileLinksRevealAnim) { setTimeout(function () { @@ -202,8 +207,8 @@ FluidbookLinks.prototype = { $this.initInlineSlideshows(); }, 200); - $(fluidbook).trigger('fluidbook.links.ready'); + $(fluidbook).trigger('fluidbook.links.ready'); this.resize(); }, diff --git a/js/libs/fluidbook/fluidbook.loader.js b/js/libs/fluidbook/fluidbook.loader.js index 1d910e4a..f64162c0 100644 --- a/js/libs/fluidbook/fluidbook.loader.js +++ b/js/libs/fluidbook/fluidbook.loader.js @@ -105,7 +105,7 @@ FluidbookLoader.prototype = { var $this = this; var $_callback; - if (this.fluidbook.support.transitions3dacc) { + if (this.fluidbook.pagetransitions.flip3d !== false) { $_callback = function () { $this.loadTexture(page, callback); }; diff --git a/js/libs/fluidbook/fluidbook.pagetransitions.js b/js/libs/fluidbook/fluidbook.pagetransitions.js index 93dbfacc..7bf3fe9a 100644 --- a/js/libs/fluidbook/fluidbook.pagetransitions.js +++ b/js/libs/fluidbook/fluidbook.pagetransitions.js @@ -8,6 +8,8 @@ FluidbookPageTransition.prototype = { init: function () { if (this.fluidbook.support.transitions3dacc && this.fluidbook.datas.mobileTransitions === 'flip3d') { this.flip3d = new Fluidbook3DFlip(this.fluidbook); + } else { + this.flip3d = false; } }, @@ -41,7 +43,7 @@ FluidbookPageTransition.prototype = { return this.pageTransition2DPortrait(pageNr); } - if(!this.fluidbook.support.transitions3d && this.fluidbook.datas.mobileTransitions === 'flip'){ + if (!this.fluidbook.support.transitions3d && this.fluidbook.datas.mobileTransitions === 'flip') { this.fluidbook.zoom.resetZoom(); return this.pageTransition2D(pageNr); } diff --git a/style/help.less b/style/help.less index c46d0329..e3965d22 100644 --- a/style/help.less +++ b/style/help.less @@ -79,7 +79,6 @@ margin-top: -1em; } } - } #helpView .interface hr { -- 2.39.5