From 9924656c0e0972683ba8a92ad63496e38be33ec0 Mon Sep 17 00:00:00 2001 From: Vincent Vanwaelscappel Date: Mon, 25 Mar 2019 11:47:12 +0100 Subject: [PATCH] wait #2645 @1 --- js/libs/fluidbook/fluidbook.js | 19 ++++++++++++++++--- js/libs/fluidbook/fluidbook.print.js | 8 ++++---- 2 files changed, 20 insertions(+), 7 deletions(-) diff --git a/js/libs/fluidbook/fluidbook.js b/js/libs/fluidbook/fluidbook.js index 45793714..4f337e11 100644 --- a/js/libs/fluidbook/fluidbook.js +++ b/js/libs/fluidbook/fluidbook.js @@ -725,7 +725,6 @@ Fluidbook.prototype = { , _openFile: function (url, e, type, localname, print) { - if (print === undefined) { print = false; } @@ -752,8 +751,22 @@ Fluidbook.prototype = { w.print(); }, 2000); } - } - , + }, + + _openFilePreload: function (url, e, type, localname, print) { + var $this = this; + this.displayLoader(); + $.ajax({ + url: url, + type: 'HEAD', + success: function (data) { + $this._openFile(url, e, type, localname, print); + $this.hideLoader(1, true); + }, + }); + + }, + _downloadFilePhonegap: function (url, localname, fs, callback, callbackArgs) { console.log('download file phonegap'); var $this = this; diff --git a/js/libs/fluidbook/fluidbook.print.js b/js/libs/fluidbook/fluidbook.print.js index 8427b39c..9491362e 100644 --- a/js/libs/fluidbook/fluidbook.print.js +++ b/js/libs/fluidbook/fluidbook.print.js @@ -24,14 +24,14 @@ FluidbookPrint.prototype = { switch (choice) { case 'left': - $this.fluidbook._openFile(dynamicPDF + leftPageNumber, element, 'pdf', leftPageNumber + '.pdf', print); + $this.fluidbook._openFilePreload(dynamicPDF + leftPageNumber, element, 'pdf', leftPageNumber + '.pdf', print); break; case 'right': - $this.fluidbook._openFile(dynamicPDF + rightPageNumber, element, 'pdf', rightPageNumber + '.pdf', print); + $this.fluidbook._openFilePreload(dynamicPDF + rightPageNumber, element, 'pdf', rightPageNumber + '.pdf', print); break; case 'double': var pageRange = leftPageNumber + '-' + rightPageNumber; - $this.fluidbook._openFile(dynamicPDF + pageRange, element, 'pdf', pageRange + '.pdf', print); + $this.fluidbook._openFilePreload(dynamicPDF + pageRange, element, 'pdf', pageRange + '.pdf', print); break; case 'all': $this.fluidbook.openPDF(element, print); @@ -52,7 +52,7 @@ FluidbookPrint.prototype = { return false; } var pageRange = rangeStart + '-' + rangeEnd; - $this.fluidbook._openFile(dynamicPDF + pageRange, element, 'pdf', pageRange + '.pdf', print); + $this.fluidbook._openFilePreload(dynamicPDF + pageRange, element, 'pdf', pageRange + '.pdf', print); break; default: return false; -- 2.39.5