Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improve the PDFViewerApplication._contentLength handling in the viewer, related mostly to scripting #12822

Merged
merged 1 commit into from
Jan 7, 2021
Merged

Improve the PDFViewerApplication._contentLength handling in the viewer, related mostly to scripting #12822

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 22 additions & 16 deletions web/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1242,7 +1242,8 @@ const PDFViewerApplication = {
load(pdfDocument) {
this.pdfDocument = pdfDocument;

pdfDocument.getDownloadInfo().then(() => {
pdfDocument.getDownloadInfo().then(({ length }) => {
this._contentLength = length; // Ensure that the correct length is used.
this.downloadComplete = true;
this.loadingBar.hide();

Expand Down Expand Up @@ -1498,6 +1499,25 @@ const PDFViewerApplication = {
return; // The document was closed while the metadata resolved.
}
}
if (!this._contentLength) {
// Always waiting for the entire PDF document to be loaded will, most
// likely, delay sandbox-creation too much in the general case for all
// PDF documents which are not provided as binary data to the API.
// Hence we'll simply have to trust that the `contentLength` (as provided
// by the server), when it exists, is accurate enough here.
await new Promise(resolve => {
this.eventBus._on(
"documentloaded",
evt => {
resolve();
},
{ once: true }
);
});
if (pdfDocument !== this.pdfDocument) {
return; // The document was closed while the downloadInfo resolved.
}
}

const updateFromSandbox = ({ detail }) => {
const { id, command, value } = detail;
Expand Down Expand Up @@ -1564,20 +1584,6 @@ const PDFViewerApplication = {
window.addEventListener(name, listener);
}

if (!this._contentLength) {
// Always waiting for the entire PDF document to be loaded will, most
// likely, delay sandbox-creation too much in the general case for all
// PDF documents which are not provided as binary data to the API.
// Hence we'll simply have to trust that the `contentLength` (as provided
// by the server), when it exists, is accurate enough here.
const { length } = await pdfDocument.getDownloadInfo();

if (pdfDocument !== this.pdfDocument) {
return; // The document was closed while the download info resolved.
}
this._contentLength = length;
}

try {
await scripting.createSandbox({
objects,
Expand Down Expand Up @@ -1701,7 +1707,7 @@ const PDFViewerApplication = {
this.documentInfo = info;
this.metadata = metadata;
this._contentDispositionFilename = contentDispositionFilename;
this._contentLength = contentLength;
this._contentLength ??= contentLength; // See `getDownloadInfo`-call above.

// Provides some basic debug information
console.log(
Expand Down