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

Ensure that automatic printing still works when the viewer and/or its pages are hidden (bug 1618621, bug 1618955)

Browse Source 
Please note that this patch, on its own, won't magically fix all of these printing bugs without [bug 1618553](https://bugzilla.mozilla.org/show_bug.cgi?id=1618553) also being fixed.
(However I don't foresee that being too difficult, famous last words :-), but it will as suggested require a platform API that we can notify when the viewer is ready.)

Fixes https://bugzilla.mozilla.org/show_bug.cgi?id=1618621
Fixes https://bugzilla.mozilla.org/show_bug.cgi?id=1618955
Fixes 8208
This commit is contained in:
Jonas Jenwald 2020-03-24 12:58:34 +01:00
parent 85838fc505
commit c5b0b5c754
2 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
web/base_viewer.js
View File

@ -396,6 +396,27 @@ class BaseViewer {
throw new Error("Not implemented: _setDocumentViewerElement"); throw new Error("Not implemented: _setDocumentViewerElement");
} }
/**
* @private
*/
_onePageRenderedOrForceFetch() {
// Unless the viewer *and* its pages are visible, rendering won't start and
// `this._onePageRenderedCapability` thus won't be resolved.
// To ensure that automatic printing, on document load, still works even in
// those cases we force-allow fetching of all pages when:
// - The viewer is hidden in the DOM, e.g. in a `display: none` <iframe>
// element; fixes bug 1618621.
// - The viewer is visible, but none of the pages are (e.g. if the
// viewer is very small); fixes bug 1618955.
if (
!this.container.offsetParent ||
this._getVisiblePages().views.length === 0
) {
return Promise.resolve();
}
return this._onePageRenderedCapability.promise;
}
/** /**
* @param pdfDocument {PDFDocument} * @param pdfDocument {PDFDocument}
*/ */
@ -492,7 +513,7 @@ class BaseViewer {
// Fetch all the pages since the viewport is needed before printing // Fetch all the pages since the viewport is needed before printing
// starts to create the correct size canvas. Wait until one page is // starts to create the correct size canvas. Wait until one page is
// rendered so we don't tie up too many resources early on. // rendered so we don't tie up too many resources early on.
this._onePageRenderedCapability.promise.then(() => { this._onePageRenderedOrForceFetch().then(() => {
if (this.findController) { if (this.findController) {
this.findController.setDocument(pdfDocument); // Enable searching. this.findController.setDocument(pdfDocument); // Enable searching.
} }

2
web/ui_utils.js
View File

@ -229,7 +229,7 @@ function binarySearchFirstItem(items, condition) {
let minIndex = 0; let minIndex = 0;
let maxIndex = items.length - 1; let maxIndex = items.length - 1;
if (items.length === 0 || !condition(items[maxIndex])) { if (maxIndex < 0 || !condition(items[maxIndex])) {
return items.length; return items.length;
} }
if (condition(items[minIndex])) { if (condition(items[minIndex])) {