Skip to content

Commit

Permalink
Merge pull request #13577 from Snuffleupagus/rm-PDFScriptingManager._…
Browse files Browse the repository at this point in the history
…pageEventsReady

Remove the internal `PDFScriptingManager._pageEventsReady` boolean (PR 13074 follow-up)
  • Loading branch information
timvandermeij committed Jun 18, 2021
2 parents 5d251a3 + 5db7a3c commit 248efb1
Showing 1 changed file with 10 additions and 8 deletions.
18 changes: 10 additions & 8 deletions web/pdf_scripting_manager.js
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ class PDFScriptingManager {

this._scripting = null;
this._mouseState = Object.create(null);
this._pageEventsReady = false;
this._ready = false;

this._eventBus = eventBus;
Expand Down Expand Up @@ -97,7 +96,14 @@ class PDFScriptingManager {
if (pdfDocument !== this._pdfDocument) {
return; // The document was closed while the data resolved.
}
this._scripting = this._createScripting();
try {
this._scripting = this._createScripting();
} catch (error) {
console.error(`PDFScriptingManager.setDocument: "${error?.message}".`);

await this._destroyScripting();
return;
}

this._internalEvents.set("updatefromsandbox", event => {
if (event?.source !== window) {
Expand Down Expand Up @@ -308,7 +314,6 @@ class PDFScriptingManager {
return;
}
}

delete detail.id;
delete detail.siblings;

Expand All @@ -333,10 +338,8 @@ class PDFScriptingManager {

if (initialize) {
this._closeCapability = createPromiseCapability();

this._pageEventsReady = true;
}
if (!this._pageEventsReady) {
if (!this._closeCapability) {
return; // Scripting isn't fully initialized yet.
}
const pageView = this._pdfViewer.getPageView(/* index = */ pageNumber - 1);
Expand Down Expand Up @@ -373,7 +376,7 @@ class PDFScriptingManager {
const pdfDocument = this._pdfDocument,
visitedPages = this._visitedPages;

if (!this._pageEventsReady) {
if (!this._closeCapability) {
return; // Scripting isn't fully initialized yet.
}
if (this._pageOpenPending.has(pageNumber)) {
Expand Down Expand Up @@ -481,7 +484,6 @@ class PDFScriptingManager {

this._scripting = null;
delete this._mouseState.isDown;
this._pageEventsReady = false;
this._ready = false;

this._destroyCapability?.resolve();
Expand Down

0 comments on commit 248efb1

Please sign in to comment.