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

Merge pull request #14345 from Snuffleupagus/viewer-pagesPromise-reject

Browse Source 
Ensure that the viewer handles `BaseViewer` initialization failures
This commit is contained in:
Tim van der Meij 2021-12-05 13:40:24 +01:00 committed by GitHub
commit 3264d72e60
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 32 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
web/app.js
View File

@ -949,22 +949,22 @@ const PDFViewerApplication = {
pdfDocument => {
this.load(pdfDocument);
},
exception => {
reason => {
if (loadingTask !== this.pdfLoadingTask) {
return undefined; // Ignore errors for previously opened PDF files.
}
let key = "loading_error";
if (exception instanceof InvalidPDFException) {
if (reason instanceof InvalidPDFException) {
key = "invalid_file_error";
} else if (exception instanceof MissingPDFException) {
} else if (reason instanceof MissingPDFException) {
key = "missing_file_error";
} else if (exception instanceof UnexpectedResponseException) {
} else if (reason instanceof UnexpectedResponseException) {
key = "unexpected_response_error";
}
return this.l10n.get(key).then(msg => {
this._documentError(msg, { message: exception?.message });
throw exception;
this._documentError(msg, { message: reason?.message });
throw reason;
});
}
);
@ -1368,11 +1368,18 @@ const PDFViewerApplication = {
});
});
pagesPromise.then(() => {
this._unblockDocumentLoadEvent();
pagesPromise.then(
() => {
this._unblockDocumentLoadEvent();
this._initializeAutoPrint(pdfDocument, openActionPromise);
});
this._initializeAutoPrint(pdfDocument, openActionPromise);
},
reason => {
this.l10n.get("loading_error").then(msg => {
this._documentError(msg, { message: reason?.message });
});
}
);
onePageRendered.then(data => {
this.externalServices.reportTelemetry({

16
web/base_viewer.js
View File

@ -530,12 +530,14 @@ class BaseViewer {
this.eventBus.dispatch("scrollmodechanged", { source: this, mode });
}
this._pagesCapability.promise.then(() => {
this.eventBus.dispatch("pagesloaded", {
source: this,
pagesCount,
});
});
this._pagesCapability.promise.then(
() => {
this.eventBus.dispatch("pagesloaded", { source: this, pagesCount });
},
() => {
/* Prevent "Uncaught (in promise)"-messages in the console. */
}
);
this._onBeforeDraw = evt => {
const pageView = this._pages[evt.pageNumber - 1];
@ -680,6 +682,8 @@ class BaseViewer {
})
.catch(reason => {
console.error("Unable to initialize viewer", reason);
this._pagesCapability.reject(reason);
});
}

8
web/pdf_outline_viewer.js
View File

@ -72,7 +72,7 @@ class PDFOutlineViewer extends BaseTreeViewer {
this._pageNumberToDestHashCapability = null;
this._currentPageNumber = 1;
this._isPagesLoaded = false;
this._isPagesLoaded = null;
if (
this._currentOutlineItemCapability &&
@ -93,8 +93,10 @@ class PDFOutlineViewer extends BaseTreeViewer {
this._pdfDocument?.loadingParams.disableAutoFetch
) {
this._currentOutlineItemCapability.resolve(/* enabled = */ false);
} else if (this._isPagesLoaded) {
this._currentOutlineItemCapability.resolve(/* enabled = */ true);
} else if (this._isPagesLoaded !== null) {
this._currentOutlineItemCapability.resolve(
/* enabled = */ this._isPagesLoaded
);
}
this.eventBus.dispatch("outlineloaded", {