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

Check that the correct pdfDocument is still active, before rendering the outline/attachments/layers

Browse Source 
*This patch fixes some technical debt in the viewer.*

Given that most API methods are (purposely) asynchronous, there's always a risk that the viewer could have been `close`d before the requested data arrives.
Lately we've started to check this case before using the data, to prevent errors and/or inconsistent state, however the outline/attachments/layers fetching and rendering is old enough that it pre-dates those checks.
This commit is contained in:
Jonas Jenwald 2021-04-10 12:46:45 +02:00
parent f5e973d555
commit 05b0798824
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
web/app.js
View File

@ -1383,14 +1383,23 @@ const PDFViewerApplication = {
onePageRendered.then(() => { onePageRendered.then(() => {
pdfDocument.getOutline().then(outline => { pdfDocument.getOutline().then(outline => {
if (pdfDocument !== this.pdfDocument) {
return; // The document was closed while the outline resolved.
}
this.pdfOutlineViewer.render({ outline, pdfDocument }); this.pdfOutlineViewer.render({ outline, pdfDocument });
}); });
pdfDocument.getAttachments().then(attachments => { pdfDocument.getAttachments().then(attachments => {
if (pdfDocument !== this.pdfDocument) {
return; // The document was closed while the attachments resolved.
}
this.pdfAttachmentViewer.render({ attachments }); this.pdfAttachmentViewer.render({ attachments });
}); });
// Ensure that the layers accurately reflects the current state in the // Ensure that the layers accurately reflects the current state in the
// viewer itself, rather than the default state provided by the API. // viewer itself, rather than the default state provided by the API.
pdfViewer.optionalContentConfigPromise.then(optionalContentConfig => { pdfViewer.optionalContentConfigPromise.then(optionalContentConfig => {
if (pdfDocument !== this.pdfDocument) {
return; // The document was closed while the layers resolved.
}
this.pdfLayerViewer.render({ optionalContentConfig, pdfDocument }); this.pdfLayerViewer.render({ optionalContentConfig, pdfDocument });
}); });
if ( if (