From c765ba0e191585a858c2e27e7cfa6207579c1aa7 Mon Sep 17 00:00:00 2001 From: Vincent Vanwaelscappel Date: Thu, 4 Oct 2018 18:37:35 +0200 Subject: [PATCH] done #2288 @1.5 --- js/libs/fluidbook/fluidbook.js | 14 ++++++++++---- js/libs/fluidbook/fluidbook.resize.js | 4 +++- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/js/libs/fluidbook/fluidbook.js b/js/libs/fluidbook/fluidbook.js index f9577e65..0ef20547 100644 --- a/js/libs/fluidbook/fluidbook.js +++ b/js/libs/fluidbook/fluidbook.js @@ -40,6 +40,7 @@ Fluidbook.prototype = { this.viewport.updateViewport(); this.desktop = new FluidbookDesktop(this); this.share = new FluidbookShare(this); + this.firstTransition = true; if (Modernizr.ftouch && this.support.transitions2d && this.datas.mobileTransitions != 'none') { this.touch = new FluidbookTouch(this); } @@ -59,9 +60,9 @@ Fluidbook.prototype = { this.form = new FluidbookBulleForm(this); } else if (this.datas.form == 'bourbon') { this.form = new FluidbookBourbonForm(this); - } else if(this.datas.form=='avery'){ + } else if (this.datas.form == 'avery') { this.form = new FluidbookAveryForm(this); - }else{ + } else { this.form == false; } this.privacy = new FluidbookPrivacy(this); @@ -443,6 +444,7 @@ Fluidbook.prototype = { return; }, pageTransition: function (pageNr) { + $(this).trigger('fluidbook.beforePageTransition'); this.tooltip.hideTooltip(); @@ -453,8 +455,13 @@ Fluidbook.prototype = { pageNr = 1; } } + console.log('transiton to ' + pageNr); pageNr = this.normalizePage(pageNr); - if (pageNr == this.normalizePage(this.currentPage) || this.currentPage == -1 || !this.support.transitions2d || this.datas.mobileTransitions == 'none') { + if(pageNr===0){ + throw new Error('!!!'); + } + if (this.firstTransition || pageNr === this.normalizePage(this.currentPage) || this.currentPage === -1 || !this.support.transitions2d || this.datas.mobileTransitions === 'none') { + this.firstTransition = false; return this.pageTransition1D(pageNr); } if (this.displayOnePage) { @@ -927,7 +934,6 @@ Fluidbook.prototype = { this._openFile(pdf, button, 'pdf', pdfName, print); }, - _openFile: function (url, e, type, localname, print) { if (print === undefined) { diff --git a/js/libs/fluidbook/fluidbook.resize.js b/js/libs/fluidbook/fluidbook.resize.js index 130b840a..951be9ce 100644 --- a/js/libs/fluidbook/fluidbook.resize.js +++ b/js/libs/fluidbook/fluidbook.resize.js @@ -376,7 +376,9 @@ FluidbookResize.prototype = { console.warn('Orientation change! ' + this.orientation); $(this.fluidbook).trigger('fluidbook.resize.beforeOrientationChange'); this.fluidbook.zoom.resetZoom(); - this.fluidbook.pageTransition(); + if(!this.fluidbook.firstTransition) { + this.fluidbook.pageTransition(); + } $(this.fluidbook).trigger('fluidbook.resize.orientation', {orientation: this.orientation}); if (this.fluidbook.support.android) { setTimeout(function () { -- 2.39.5