From 26509e4c5b0ddb0d3d37218ca470c5d3f7e9f988 Mon Sep 17 00:00:00 2001 From: Vincent Vanwaelscappel Date: Wed, 3 Apr 2019 15:23:58 +0200 Subject: [PATCH] wip #2657 @1 --- js/libs/fluidbook/fluidbook.loader.js | 5 +++++ js/libs/fluidbook/fluidbook.mobilefirst.js | 17 ++++++++++++++--- style/fluidbook.less | 8 ++++++++ 3 files changed, 27 insertions(+), 3 deletions(-) diff --git a/js/libs/fluidbook/fluidbook.loader.js b/js/libs/fluidbook/fluidbook.loader.js index f643ff97..1f8686d1 100644 --- a/js/libs/fluidbook/fluidbook.loader.js +++ b/js/libs/fluidbook/fluidbook.loader.js @@ -21,6 +21,11 @@ FluidbookLoader.prototype = { this.shadeRight = this.loadImage('images/shadows/pages/right.png'); }, + getPageDimensions: function (page) { + var dim = this.fluidbook.datas.pagesDimensions[page]; + return {width: dim[0], height: dim[1]}; + }, + getVersionToLoad: function (page) { if (this.fluidbook.vectorTexts) { if (this.fluidbook.datas.vectorPages.indexOf(page) >= 0) { diff --git a/js/libs/fluidbook/fluidbook.mobilefirst.js b/js/libs/fluidbook/fluidbook.mobilefirst.js index cf42df4b..041f2efc 100644 --- a/js/libs/fluidbook/fluidbook.mobilefirst.js +++ b/js/libs/fluidbook/fluidbook.mobilefirst.js @@ -15,6 +15,12 @@ FluidbookMobileFirst.prototype = { }, beforeTransition: function (page) { + var dimensions = this.fluidbook.loader.getPageDimensions(page); + $("#nextDoublePage .page, #nextDoublePage").css({ + height: dimensions.height, + maxHeight: dimensions.height + }); + TweenLite.to("#scroll", this.fluidbook.pagetransitions.getTransitionDuration(page), {scrollTo: 0}); }, @@ -22,13 +28,18 @@ FluidbookMobileFirst.prototype = { $('#pages .mf-nav').remove(); $("#pages").append(this.getFooterNavigation(page)); this.fluidbook.resize.resize(); + var $this=this; + setTimeout(function(){ + this.fluidbook.resize.resize(); + },1000); }, resize: function () { - var h = $(".doublePage").outerHeight(); - $('#pages .mf-nav').css('top', h); - h += $("#pages .mf-nav").outerHeight(); + var bh = $("#currentDoublePage").outerHeight(); + $('#pages .mf-nav').css('top', bh); + var h = bh+$("#pages .mf-nav").outerHeight(); + $("#links,#searchHighlights").css({height:bh}); $("#pages,#fluidbook").css({height: h}); $("#pages").css('maxHeight', h); }, diff --git a/style/fluidbook.less b/style/fluidbook.less index 38c4be0d..4d640f2a 100644 --- a/style/fluidbook.less +++ b/style/fluidbook.less @@ -304,10 +304,18 @@ body, html { img { width: unit(@book-page-correct-width, px); height: unit(@book-page-correct-height, px); + + .mobilefirst & { + height: 100%; + } } } .texts { + .mobilefirst & { + height: 100%; + } + img, object { position: absolute; top: 0px; -- 2.39.5