From d12d19fa772b5005ed7db7a780021d4c283b1037 Mon Sep 17 00:00:00 2001 From: KruzeII Date: Tue, 24 Nov 2020 17:23:49 +0300 Subject: [PATCH 1/6] update webpack config for .map files --- webpack.config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webpack.config.js b/webpack.config.js index a719b37..980be50 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -14,7 +14,7 @@ module.exports = { libraryTarget: 'umd', path: path.resolve(__dirname, 'dist'), filename: 'print.js', - sourceMapFilename: 'print.map', + sourceMapFilename: '[file].map[query]', libraryExport: 'default' }, module: { From ef5a1f758e5c64cb60ac343a6cbf1e7a31f6d6d9 Mon Sep 17 00:00:00 2001 From: KruzeII Date: Tue, 24 Nov 2020 17:25:36 +0300 Subject: [PATCH 2/6] waiting mouseover after print dialog close --- src/js/functions.js | 2 +- src/js/print.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/js/functions.js b/src/js/functions.js index 3cc5061..1d4a8a9 100644 --- a/src/js/functions.js +++ b/src/js/functions.js @@ -75,7 +75,7 @@ export function cleanUp (params) { // Run onPrintDialogClose callback let event = 'mouseover' - if (Browser.isChrome() || Browser.isFirefox()) { + if (Browser.isFirefox()) { // Ps.: Firefox will require an extra click in the document to fire the focus event. event = 'focus' } diff --git a/src/js/print.js b/src/js/print.js index e09e69f..a946ca6 100644 --- a/src/js/print.js +++ b/src/js/print.js @@ -13,7 +13,7 @@ const Print = { iframeElement.onload = () => { if (params.type === 'pdf') { // Add a delay for Firefox. In my tests, 1000ms was sufficient but 100ms was not - if (Browser.isFirefox()) { + if (Browser.isFirefox() || Browser.isChrome()) { setTimeout(() => performPrint(iframeElement, params), 1000) } else { performPrint(iframeElement, params) From fff27126bfb8ba57997f90204148fb9a30c6ff0f Mon Sep 17 00:00:00 2001 From: KruzeII Date: Wed, 25 Nov 2020 00:20:17 +0300 Subject: [PATCH 3/6] other event --- src/js/functions.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/js/functions.js b/src/js/functions.js index 1d4a8a9..370e19f 100644 --- a/src/js/functions.js +++ b/src/js/functions.js @@ -73,7 +73,7 @@ export function cleanUp (params) { if (params.showModal || params.onLoadingStart) window.URL.revokeObjectURL(params.printable) // Run onPrintDialogClose callback - let event = 'mouseover' + let event = 'mousemove' if (Browser.isFirefox()) { // Ps.: Firefox will require an extra click in the document to fire the focus event. From b997728a7a44896cf8e9c3991f1f7e0f9da2d2e7 Mon Sep 17 00:00:00 2001 From: KruzeII Date: Wed, 25 Nov 2020 01:05:52 +0300 Subject: [PATCH 4/6] add timeout for waiting load print dialog chrome --- src/js/functions.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/js/functions.js b/src/js/functions.js index 370e19f..1d5e838 100644 --- a/src/js/functions.js +++ b/src/js/functions.js @@ -94,7 +94,12 @@ export function cleanUp (params) { } } - window.addEventListener(event, handler) + if (Browser.isChrome()) { + // waiting for load print dialog + setTimeout(() => { window.addEventListener(event, handler) }, 1500); + } else { + window.addEventListener(event, handler); + } } export function isRawHTML (raw) { From ac6454cab5ea0208dc5f6375c8215cb764283ac3 Mon Sep 17 00:00:00 2001 From: KruzeII Date: Wed, 25 Nov 2020 10:04:06 +0300 Subject: [PATCH 5/6] standard fixes --- src/js/functions.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/js/functions.js b/src/js/functions.js index 1d5e838..069f6f6 100644 --- a/src/js/functions.js +++ b/src/js/functions.js @@ -96,9 +96,9 @@ export function cleanUp (params) { if (Browser.isChrome()) { // waiting for load print dialog - setTimeout(() => { window.addEventListener(event, handler) }, 1500); - } else { - window.addEventListener(event, handler); + setTimeout(() => { window.addEventListener(event, handler) }, 1500) + } else { + window.addEventListener(event, handler) } } From 5ac5a649301331ccb6f3311f5b6054d4f7f396f9 Mon Sep 17 00:00:00 2001 From: KruzeII Date: Wed, 25 Nov 2020 17:22:26 +0300 Subject: [PATCH 6/6] exclude changes --- src/js/print.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/js/print.js b/src/js/print.js index a946ca6..e09e69f 100644 --- a/src/js/print.js +++ b/src/js/print.js @@ -13,7 +13,7 @@ const Print = { iframeElement.onload = () => { if (params.type === 'pdf') { // Add a delay for Firefox. In my tests, 1000ms was sufficient but 100ms was not - if (Browser.isFirefox() || Browser.isChrome()) { + if (Browser.isFirefox()) { setTimeout(() => performPrint(iframeElement, params), 1000) } else { performPrint(iframeElement, params)