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

Merge pull request #14388 from Snuffleupagus/bug-1746213

Browse Source 
Unblock the "load" event in inactive windows/tabs (bug 1746213, PR 11646 follow-up)
This commit is contained in:
Jonas Jenwald 2021-12-21 10:04:10 +01:00 committed by GitHub
commit 41dab8e7b6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 43 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
web/base_viewer.js
View File

@ -207,6 +207,8 @@ class BaseViewer {
#scrollModePageState = null; #scrollModePageState = null;
#onVisibilityChange = null;
/** /**
* @param {PDFViewerOptions} options * @param {PDFViewerOptions} options
*/ */
@ -533,17 +535,42 @@ class BaseViewer {
// `this._onePageRenderedCapability` thus won't be resolved. // `this._onePageRenderedCapability` thus won't be resolved.
// To ensure that automatic printing, on document load, still works even in // To ensure that automatic printing, on document load, still works even in
// those cases we force-allow fetching of all pages when: // those cases we force-allow fetching of all pages when:
// - The current window/tab is inactive, which will prevent rendering since
// `requestAnimationFrame` is being used; fixes bug 1746213.
// - The viewer is hidden in the DOM, e.g. in a `display: none` <iframe> // - The viewer is hidden in the DOM, e.g. in a `display: none` <iframe>
// element; fixes bug 1618621. // element; fixes bug 1618621.
// - The viewer is visible, but none of the pages are (e.g. if the // - The viewer is visible, but none of the pages are (e.g. if the
// viewer is very small); fixes bug 1618955. // viewer is very small); fixes bug 1618955.
if ( if (
document.visibilityState === "hidden" ||
!this.container.offsetParent || !this.container.offsetParent ||
this._getVisiblePages().views.length === 0 this._getVisiblePages().views.length === 0
) { ) {
return Promise.resolve(); return Promise.resolve();
} }
return this._onePageRenderedCapability.promise;
// Handle the window/tab becoming inactive *after* rendering has started;
// fixes (another part of) bug 1746213.
const visibilityChangePromise = new Promise(resolve => {
this.#onVisibilityChange = () => {
if (document.visibilityState !== "hidden") {
return;
}
resolve();
document.removeEventListener(
"visibilitychange",
this.#onVisibilityChange
);
this.#onVisibilityChange = null;
};
document.addEventListener("visibilitychange", this.#onVisibilityChange);
});
return Promise.race([
this._onePageRenderedCapability.promise,
visibilityChangePromise,
]);
} }
/** /**
@ -615,6 +642,14 @@ class BaseViewer {
this.eventBus._off("pagerendered", this._onAfterDraw); this.eventBus._off("pagerendered", this._onAfterDraw);
this._onAfterDraw = null; this._onAfterDraw = null;
if (this.#onVisibilityChange) {
document.removeEventListener(
"visibilitychange",
this.#onVisibilityChange
);
this.#onVisibilityChange = null;
}
}; };
this.eventBus._on("pagerendered", this._onAfterDraw); this.eventBus._on("pagerendered", this._onAfterDraw);
@ -815,6 +850,13 @@ class BaseViewer {
this.eventBus._off("pagerendered", this._onAfterDraw); this.eventBus._off("pagerendered", this._onAfterDraw);
this._onAfterDraw = null; this._onAfterDraw = null;
} }
if (this.#onVisibilityChange) {
document.removeEventListener(
"visibilitychange",
this.#onVisibilityChange
);
this.#onVisibilityChange = null;
}
// Remove the pages from the DOM... // Remove the pages from the DOM...
this.viewer.textContent = ""; this.viewer.textContent = "";
// ... and reset the Scroll mode CSS class(es) afterwards. // ... and reset the Scroll mode CSS class(es) afterwards.