From 898e2fa60e9223792c1c0399e4a967f31d009864 Mon Sep 17 00:00:00 2001 From: Vincent Vanwaelscappel Date: Tue, 14 Jan 2020 17:42:15 +0100 Subject: [PATCH] wait #3333 @4 --- js/libs/fluidbook/fluidbook.loader.js | 38 ++++++++++++++++----------- style/fluidbook.less | 16 +++++++---- 2 files changed, 34 insertions(+), 20 deletions(-) diff --git a/js/libs/fluidbook/fluidbook.loader.js b/js/libs/fluidbook/fluidbook.loader.js index 6ced7c76..207eb07c 100644 --- a/js/libs/fluidbook/fluidbook.loader.js +++ b/js/libs/fluidbook/fluidbook.loader.js @@ -25,8 +25,8 @@ FluidbookLoader.prototype = { getPageDimensions: function (page, width) { var dim = this.fluidbook.datas.pagesDimensions[page]; - if(dim===undefined){ - console.log(page); + if (dim === undefined) { + } var height; if (undefined === width) { @@ -258,7 +258,9 @@ FluidbookLoader.prototype = { } else { this.loadLeftPage(leftPage, $(doublePage), function () { - $this.loadRightPage(rightPage, $(doublePage), callback); + $this.loadRightPage(rightPage, $(doublePage), function () { + callback(); + }); }); } }, @@ -280,11 +282,11 @@ FluidbookLoader.prototype = { // Si la page existe déjà, on la place à la bonne position et on l'affiche if ($("#page_" + pageNr).length > 0) { page = $("#page_" + pageNr); - if ($(doublePage).find("#page_" + pageNr).length == 0) { + if ($(doublePage).find("#page_" + pageNr).length === 0) { $(doublePage).append(page); } if (!$(page).hasClass(position)) { - if (position == 'left') { + if (position === 'left') { $(page).removeClass('right'); } else { $(page).removeClass('left'); @@ -308,16 +310,19 @@ FluidbookLoader.prototype = { $(page).show(); $(page).addClass(position); var back = $(page).children(".background")[0]; - this.loadDatas(pageNr, callback); - $(page).addClass(position); + var $this = this; + this.loadDatas(pageNr, function () { + $(page).addClass(position); - shade = 'shade' + position; - if (this.fluidbook.datas.pageReflection) { - shade += '-reflet'; - } - shade += '.png'; - $(page).children('.clinks').html(this.fluidbook.datas.clinks[pageNr]); - $(page).children(".shade").html(this.loadPageShade(position)); + shade = 'shade' + position; + if ($this.fluidbook.datas.pageReflection) { + shade += '-reflet'; + } + shade += '.png'; + $(page).children('.clinks').html($this.fluidbook.datas.clinks[pageNr]); + $(page).children(".shade").html($this.loadPageShade(position)); + callback(); + }); }, loadPageShade: function (position) { return this.loadImage('images/shadows/pages/' + position + '.png', this.fluidbook.datas.width / 4, this.fluidbook.datas.height); @@ -356,6 +361,7 @@ FluidbookLoader.prototype = { this._loadBackground(page, function () { $(back).addClass('r' + $this.fluidbook.support.resolution); $(back).append($this.backgrounds[page]); + callback(); }); }, setOnStage: function (element) { @@ -541,7 +547,9 @@ FluidbookLoader.prototype = { loadDatas: function (pageNr, callback) { var $this = this; this.loadTexts(pageNr, function () { - $this.setBackground(pageNr, callback); + $this.setBackground(pageNr, function () { + callback(); + }); }); }, getImage: function (src, width, height, type, callback) { diff --git a/style/fluidbook.less b/style/fluidbook.less index a796b2d7..cc0b9842 100644 --- a/style/fluidbook.less +++ b/style/fluidbook.less @@ -2229,11 +2229,13 @@ ul.chapters.shareList a.level0 .svg-icon { -o-perspective-origin: 50% 75%; perspective-origin: 50% 75%; - -moz-perspective: 5000px; - -webkit-perspective: 5000px; - -o-perspective: 5000px; - -ms-perspective: 5000px; - perspective: 5000px; + @perspective: 5000px; + + -moz-perspective: @perspective; + -webkit-perspective: @perspective; + -o-perspective: @perspective; + -ms-perspective: @perspective; + perspective: @perspective; overflow: visible !important; } @@ -2271,6 +2273,10 @@ ul.chapters.shareList a.level0 .svg-icon { backface-visibility: hidden; left: 0px !important; + + .chrome & { + backface-visibility: visible; + } } .doublePage._3d .right { -- 2.39.5