From c0c1c6890e54e0dd6e98f201cccecd7d857bfd58 Mon Sep 17 00:00:00 2001 From: Vincent Vanwaelscappel Date: Tue, 16 Jan 2018 19:15:49 +0100 Subject: [PATCH] try #1584 @1.5 --- js/libs/fluidbook/fluidbook.loader.js | 21 ++++++++++++++++++++- style/fluidbook.less | 3 +++ 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/js/libs/fluidbook/fluidbook.loader.js b/js/libs/fluidbook/fluidbook.loader.js index 2af8144d..c62771ae 100644 --- a/js/libs/fluidbook/fluidbook.loader.js +++ b/js/libs/fluidbook/fluidbook.loader.js @@ -10,6 +10,9 @@ function FluidbookLoader(fluidbook) { FluidbookLoader.prototype = { getVersionToLoad: function (page) { if (this.fluidbook.vectorTexts) { + if (this.fluidbook.datas.vectorPages.indexOf(page) >= 0) { + return 'vector'; + } if (this.fluidbook.datas.rasterizePages.indexOf(page) == -1) { return 'textasvector'; } @@ -164,7 +167,11 @@ FluidbookLoader.prototype = { } this.fluidbook.initPage(pageNr, doublePage, position); + var version = this.getVersionToLoad(pageNr); page = $("#page_" + pageNr); + if (version == 'vector') { + $(page).addClass('transparentbg'); + } $(doublePage).append(page); $(page).show(); $(page).addClass(position); @@ -200,7 +207,11 @@ FluidbookLoader.prototype = { } }, getBackgroundURL: function (page) { - var prefix = this.getVersionToLoad(page) == 'textasvector' ? 'p' : 't'; + var version = this.getVersionToLoad(page); + if (version == 'vector') { + return false; + } + var prefix = (version == 'textasvector') ? 'p' : 't'; return 'data/background/' + this.fluidbook.support.resolution + '/' + prefix + page + '.jpg'; }, getTextsURL: function (page) { @@ -230,6 +241,10 @@ FluidbookLoader.prototype = { }, __loadBackground: function (page, callback) { var url = this.getBackgroundURL(page); + if (url == false) { + callback(); + return false; + } this.backgrounds[page] = this.loadImage(url, null, null, null, callback); }, loadTexts: function (pageNr, callback) { @@ -309,6 +324,10 @@ FluidbookLoader.prototype = { return $(div).get(0).outerHTML; }, loadImage: function (src, width, height, type, callback) { + if (src == false) { + callback(); + return; + } var img = new Image(); var $this = this; var callbackCalled = false; diff --git a/style/fluidbook.less b/style/fluidbook.less index 942e04d8..656a38dc 100644 --- a/style/fluidbook.less +++ b/style/fluidbook.less @@ -297,6 +297,9 @@ body, html { position: absolute; top: 0px; background-color: #fff; + &.transparentbg { + background-color: transparent; + } } .page .shade { -- 2.39.5