Sakurai/pdf.js
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Slightly modernize the print layout-methods

Browse Source 
By getting the width/height of the first page initially, we can slightly reduce the amount of code needed both in the `hasEqualPageSizes`-check and when building the print-styles.
This commit is contained in:
Jonas Jenwald 2023-04-14 09:42:03 +02:00
parent 342dc760da
commit ebf493f726
2 changed files with 12 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
web/firefox_print_service.js
View File

@ -146,16 +146,13 @@ FirefoxPrintService.prototype = {
const body = document.querySelector("body");
body.setAttribute("data-pdfjsprinting", true);
const hasEqualPageSizes = this.pagesOverview.every(function (size) {
return (
size.width === this.pagesOverview[0].width &&
size.height === this.pagesOverview[0].height
const { width, height } = this.pagesOverview[0];
const hasEqualPageSizes = this.pagesOverview.every(
size => size.width === width && size.height === height
);
}, this);
if (!hasEqualPageSizes) {
console.warn(
"Not all pages have the same size. The printed " +
"result may be incorrect!"
"Not all pages have the same size. The printed result may be incorrect!"
);
}
@ -163,8 +160,7 @@ FirefoxPrintService.prototype = {
// set. Note that we assume that all pages have the same size, because
// variable-size pages are scaled down to the initial page size in Firefox.
this.pageStyleSheet = document.createElement("style");
const pageSize = this.pagesOverview[0];
this.pageStyleSheet.textContent = `@page { size: ${pageSize.width}pt ${pageSize.height}pt;}`;
this.pageStyleSheet.textContent = `@page { size: ${width}pt ${height}pt;}`;
body.append(this.pageStyleSheet);
if (pdfDocument.isPureXfa) {

15
web/pdf_print_service.js
View File

@ -92,16 +92,13 @@ PDFPrintService.prototype = {
const body = document.querySelector("body");
body.setAttribute("data-pdfjsprinting", true);
const hasEqualPageSizes = this.pagesOverview.every(function (size) {
return (
size.width === this.pagesOverview[0].width &&
size.height === this.pagesOverview[0].height
const { width, height } = this.pagesOverview[0];
const hasEqualPageSizes = this.pagesOverview.every(
size => size.width === width && size.height === height
);
}, this);
if (!hasEqualPageSizes) {
console.warn(
"Not all pages have the same size. The printed " +
"result may be incorrect!"
"Not all pages have the same size. The printed result may be incorrect!"
);
}
@ -115,9 +112,7 @@ PDFPrintService.prototype = {
// will be ignored and the user has to select the correct paper size in
// the UI if wanted.
this.pageStyleSheet = document.createElement("style");
const pageSize = this.pagesOverview[0];
this.pageStyleSheet.textContent =
"@page { size: " + pageSize.width + "pt " + pageSize.height + "pt;}";
this.pageStyleSheet.textContent = `@page { size: ${width}pt ${height}pt;}`;
body.append(this.pageStyleSheet);
},