From 6dc5dd194f26c64ba14b1252055be808e8c4a59b Mon Sep 17 00:00:00 2001 From: Jonas Jenwald Date: Thu, 17 Jun 2021 18:01:10 +0200 Subject: [PATCH] Remove the internal `PDFScriptingManager._pageEventsReady` boolean (PR 13074 follow-up) With the introduction of `PDFScriptingManager._closeCapability` in PR 13074, the pre-existing `PDFScriptingManager._pageEventsReady` boolean essentially became redundant. Given that you always want to avoid tracking closely related state *separately*, since it's easy to introduce subtle bugs that way, we should just remove `PDFScriptingManager._pageEventsReady` now. Obviously I *should* have done this already back in PR 13074, sorry about the churn here! --- web/pdf_scripting_manager.js | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/web/pdf_scripting_manager.js b/web/pdf_scripting_manager.js index aff5926a0..c828e5ef0 100644 --- a/web/pdf_scripting_manager.js +++ b/web/pdf_scripting_manager.js @@ -46,7 +46,6 @@ class PDFScriptingManager { this._scripting = null; this._mouseState = Object.create(null); - this._pageEventsReady = false; this._ready = false; this._eventBus = eventBus; @@ -308,7 +307,6 @@ class PDFScriptingManager { return; } } - delete detail.id; delete detail.siblings; @@ -333,10 +331,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); @@ -373,7 +369,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)) { @@ -481,7 +477,6 @@ class PDFScriptingManager { this._scripting = null; delete this._mouseState.isDown; - this._pageEventsReady = false; this._ready = false; this._destroyCapability?.resolve();