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

Merge pull request #10959 from Snuffleupagus/rm-PrintService-body-attribute

Browse Source 
Remove the `data-pdfjsprinting` attribute on the `<body>` when destroying `FirefoxPrintService`/`PDFPrintService` instances (issue 10948)
This commit is contained in:
Tim van der Meij 2019-07-11 23:12:40 +02:00 committed by GitHub
commit 6e594a89da
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
web/firefox_print_service.js
View File

@ -77,18 +77,21 @@ function FirefoxPrintService(pdfDocument, pagesOverview, printContainer) {
FirefoxPrintService.prototype = { FirefoxPrintService.prototype = {
layout() { layout() {
let pdfDocument = this.pdfDocument; const { pdfDocument, pagesOverview, printContainer, } = this;
let printContainer = this.printContainer;
let body = document.querySelector('body'); const body = document.querySelector('body');
body.setAttribute('data-pdfjsprinting', true); body.setAttribute('data-pdfjsprinting', true);
for (let i = 0, ii = this.pagesOverview.length; i < ii; ++i) { for (let i = 0, ii = pagesOverview.length; i < ii; ++i) {
composePage(pdfDocument, i + 1, this.pagesOverview[i], printContainer); composePage(pdfDocument, i + 1, pagesOverview[i], printContainer);
} }
}, },
destroy() { destroy() {
this.printContainer.textContent = ''; this.printContainer.textContent = '';
const body = document.querySelector('body');
body.removeAttribute('data-pdfjsprinting');
}, },
}; };

6
web/pdf_print_service.js
View File

@ -74,7 +74,7 @@ PDFPrintService.prototype = {
layout() { layout() {
this.throwIfInactive(); this.throwIfInactive();
let body = document.querySelector('body'); const body = document.querySelector('body');
body.setAttribute('data-pdfjsprinting', true); body.setAttribute('data-pdfjsprinting', true);
let hasEqualPageSizes = this.pagesOverview.every(function(size) { let hasEqualPageSizes = this.pagesOverview.every(function(size) {
@ -114,6 +114,10 @@ PDFPrintService.prototype = {
return; return;
} }
this.printContainer.textContent = ''; this.printContainer.textContent = '';
const body = document.querySelector('body');
body.removeAttribute('data-pdfjsprinting');
if (this.pageStyleSheet) { if (this.pageStyleSheet) {
this.pageStyleSheet.remove(); this.pageStyleSheet.remove();
this.pageStyleSheet = null; this.pageStyleSheet = null;