From 44dd0c975e699cf9503295346e978207b1451c00 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Mon, 22 May 2023 08:20:49 +1000 Subject: [PATCH] Minor fixes for rendering --- public/js/clients/shared/pdf.js | 22 ++++++++++++++++++++-- public/mix-manifest.json | 2 +- resources/js/clients/shared/pdf.js | 22 ++++++++++++++++++++-- 3 files changed, 41 insertions(+), 5 deletions(-) diff --git a/public/js/clients/shared/pdf.js b/public/js/clients/shared/pdf.js index fbf628b2323f..117fb2d34942 100644 --- a/public/js/clients/shared/pdf.js +++ b/public/js/clients/shared/pdf.js @@ -29,10 +29,10 @@ var PDF = /*#__PURE__*/function () { this.context = canvas.getContext('2d'); this.currentPage = 1; this.maxPages = 1; - this.currentScale = 1.25; + this.currentScale = 1; this.currentScaleText = document.getElementById('zoom-level'); if (matchMedia('only screen and (max-width: 480px)').matches) { - this.currentScale = 1.25; + this.currentScale = 1; } this.currentScaleText.textContent = this.currentScale * 100 + '%'; } @@ -135,6 +135,24 @@ var PDF = /*#__PURE__*/function () { viewport: viewport }); this.setPagesInViewport(); + + /* document.addEventListener("webviewerloaded", function () { + PDFViewerApplication.initializedPromise.then(function () { + PDFViewerApplication.eventBus.on("pagerendered", function handler(event) { + try { + if (window.chrome && !/Edge/.test(navigator.userAgent) && !event.source.__rerendered) { + console.log("Chrome-like browser detected, re-rendering page %d for the first time.", event.pageNumber); + var currentScale = event.source.scale; + event.source.__rerendered = true; + event.source.update(currentScale * 0.99); + event.source.update(currentScale); + } + } catch (e) { + console.error(e); + } + }); + }); + }); */ case 14: case "end": return _context.stop(); diff --git a/public/mix-manifest.json b/public/mix-manifest.json index 795e4ebed0e4..53dba6447150 100644 --- a/public/mix-manifest.json +++ b/public/mix-manifest.json @@ -19,7 +19,7 @@ "/js/clients/payments/stripe-credit-card.js": "/js/clients/payments/stripe-credit-card.js?id=b483e14d15000c04edfe4c9c80fb97c9", "/js/setup/setup.js": "/js/setup/setup.js?id=086b9e114b0b9ee01f909d686f489162", "/js/clients/payments/card-js.min.js": "/js/clients/payments/card-js.min.js?id=cf50b5ba1fcd1d184bf0c10d710672c8", - "/js/clients/shared/pdf.js": "/js/clients/shared/pdf.js?id=40f4f82b01d751c284337279b92b9297", + "/js/clients/shared/pdf.js": "/js/clients/shared/pdf.js?id=c9593b44d66f89874d13f99bc3e6ff33", "/js/clients/shared/multiple-downloads.js": "/js/clients/shared/multiple-downloads.js?id=bc6756a5ef373ffab30373a6b689d5d4", "/js/clients/linkify-urls.js": "/js/clients/linkify-urls.js?id=a9c53bbbced7b1f09cae117f667638cf", "/js/clients/payments/braintree-credit-card.js": "/js/clients/payments/braintree-credit-card.js?id=e0020a4104a2d88c21e47ec6679de7ef", diff --git a/resources/js/clients/shared/pdf.js b/resources/js/clients/shared/pdf.js index a3b2ed4e9bea..0e9ebc998101 100644 --- a/resources/js/clients/shared/pdf.js +++ b/resources/js/clients/shared/pdf.js @@ -15,11 +15,11 @@ class PDF { this.context = canvas.getContext('2d'); this.currentPage = 1; this.maxPages = 1; - this.currentScale = 1.25; + this.currentScale = 1; this.currentScaleText = document.getElementById('zoom-level'); if (matchMedia('only screen and (max-width: 480px)').matches) { - this.currentScale = 1.25; + this.currentScale = 1; } this.currentScaleText.textContent = this.currentScale * 100 + '%'; @@ -131,6 +131,24 @@ class PDF { }); this.setPagesInViewport(); + + /* document.addEventListener("webviewerloaded", function () { + PDFViewerApplication.initializedPromise.then(function () { + PDFViewerApplication.eventBus.on("pagerendered", function handler(event) { + try { + if (window.chrome && !/Edge/.test(navigator.userAgent) && !event.source.__rerendered) { + console.log("Chrome-like browser detected, re-rendering page %d for the first time.", event.pageNumber); + var currentScale = event.source.scale; + event.source.__rerendered = true; + event.source.update(currentScale * 0.99); + event.source.update(currentScale); + } + } catch (e) { + console.error(e); + } + }); + }); + }); */ } }