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

Ensure that currentOutlineButton enabling/disabling won't depend on the exact timing of the "pagesloaded" event (PR 13212 follow-up)

Browse Source 
I (unsurprisingly) managed to forget about handling the case where a "pagesloaded" event arrives *before* the outline has been parsed, in which case we'd not actually enable the `currentOutlineButton` as intended.
Also, in the "pagesloaded" event handler, we should ensure that there's actually any pages loaded since otherwise the "find current outlineItem"-feature doesn't make any sense.
This commit is contained in:
Jonas Jenwald 2021-04-11 10:36:46 +02:00
parent 4ac1082838
commit f285e41f02
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
web/pdf_outline_viewer.js
View File

@ -54,13 +54,15 @@ class PDFOutlineViewer extends BaseTreeViewer {
this.eventBus._on("pagesloaded", evt => { this.eventBus._on("pagesloaded", evt => {
this._isPagesLoaded = !!evt.pagesCount; this._isPagesLoaded = !!evt.pagesCount;
// If the capability is still pending, note the `_dispatchEvent`-method, // If the capability is still pending, see the `_dispatchEvent`-method,
// we know that the `currentOutlineItem`-button should be enabled here. // we know that the `currentOutlineItem`-button can be enabled here.
if ( if (
this._currentOutlineItemCapability && this._currentOutlineItemCapability &&
!this._currentOutlineItemCapability.settled !this._currentOutlineItemCapability.settled
) { ) {
this._currentOutlineItemCapability.resolve(/* enabled = */ true); this._currentOutlineItemCapability.resolve(
/* enabled = */ this._isPagesLoaded
);
} }
}); });
this.eventBus._on("sidebarviewchanged", evt => { this.eventBus._on("sidebarviewchanged", evt => {
@ -95,6 +97,8 @@ class PDFOutlineViewer extends BaseTreeViewer {
this._pdfDocument?.loadingParams.disableAutoFetch this._pdfDocument?.loadingParams.disableAutoFetch
) { ) {
this._currentOutlineItemCapability.resolve(/* enabled = */ false); this._currentOutlineItemCapability.resolve(/* enabled = */ false);
} else if (this._isPagesLoaded) {
this._currentOutlineItemCapability.resolve(/* enabled = */ true);
} }
this.eventBus.dispatch("outlineloaded", { this.eventBus.dispatch("outlineloaded", {