From 416ab3f12884fa63d2f80962d21068bbd3c91090 Mon Sep 17 00:00:00 2001 From: Vincent Vanwaelscappel Date: Mon, 16 Oct 2017 18:42:39 +0200 Subject: [PATCH] wip #1748 @2 --- js/libs/fluidbook/fluidbook.background.js | 5 ++++- js/libs/fluidbook/fluidbook.js | 1 + js/libs/fluidbook/fluidbook.resize.js | 4 ++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/js/libs/fluidbook/fluidbook.background.js b/js/libs/fluidbook/fluidbook.background.js index 028b97ff..0a14f0c0 100644 --- a/js/libs/fluidbook/fluidbook.background.js +++ b/js/libs/fluidbook/fluidbook.background.js @@ -20,7 +20,10 @@ FluidbookBackground.prototype = { } var left, top, iw, ih; - if (this.fluidbook.datas.repeat == Fluidbook.NONE) { + + if (this.fluidbook.datas.backgroundImageDimensions == undefined) { + + } else if (this.fluidbook.datas.repeat == Fluidbook.NONE) { iw = this.fluidbook.datas.backgroundImageDimensions.width; ih = this.fluidbook.datas.backgroundImageDimensions.height; diff --git a/js/libs/fluidbook/fluidbook.js b/js/libs/fluidbook/fluidbook.js index d73b637f..cb09085c 100644 --- a/js/libs/fluidbook/fluidbook.js +++ b/js/libs/fluidbook/fluidbook.js @@ -625,6 +625,7 @@ Fluidbook.prototype = { if (d == undefined) { d = 1; } + $(this).trigger('fluidbook.page.change.start', [page]); this.tooltip.hideTooltip(); $(".axis_y").removeClass('axis_y'); $(".axis_x").removeClass('axis_x'); diff --git a/js/libs/fluidbook/fluidbook.resize.js b/js/libs/fluidbook/fluidbook.resize.js index c11fd29e..68c63344 100644 --- a/js/libs/fluidbook/fluidbook.resize.js +++ b/js/libs/fluidbook/fluidbook.resize.js @@ -226,7 +226,7 @@ FluidbookResize.prototype = { $(window).scrollTop(0); $(window).trigger('fluidbookresize'); - $(this.fluidbook).trigger('fluidbook.resize'); + $(this.fluidbook).trigger('fluidbook.resize', {ww: this.ww, wh: this.wh, orientation: this.orientation, fluidbookrect: $("#fluidbook").get(0).getBoundingClientRect()}); }, resizeNav: function (interfaceScale) { var topNext = (this.hh - (100 * interfaceScale)) / 2; @@ -307,7 +307,7 @@ FluidbookResize.prototype = { $(this.fluidbook).trigger('fluidbook.resize.beforeOrientationChange'); this.fluidbook.zoom.resetZoom(); this.fluidbook.pageTransition(); - $(this.fluidbook).trigger('fluidbook.resize.orientation'); + $(this.fluidbook).trigger('fluidbook.resize.orientation', this.orientation); } }, getScreenFluidbookWidth: function () { -- 2.39.5