ZenBrowserMirrors/pdf.js
1
0
Fork 0
mirror of https://github.com/zen-browser/pdf.js.git synced 2025-07-08 09:20:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove event listeners with signal in web/pdf_scripting_manager.js

Browse source
This commit is contained in:
Jonas Jenwald 2024-04-18 20:34:44 +02:00
parent bf785f2180
commit 2831caef13
1 changed files with 60 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

65
web/pdf_scripting_manager.js
View file

@ -37,6 +37,8 @@ class PDFScriptingManager {
#docProperties = null; #docProperties = null;
#eventAbortController = null;
#eventBus = null; #eventBus = null;
#externalServices = null; #externalServices = null;
@ -108,24 +110,42 @@ class PDFScriptingManager {
await this.#destroyScripting(); await this.#destroyScripting();
return; return;
} }
const eventBus = this.#eventBus;
this._internalEvents.set("updatefromsandbox", event => { this.#eventAbortController = new AbortController();
const { signal } = this.#eventAbortController;
eventBus._on(
"updatefromsandbox",
event => {
if (event?.source === window) { if (event?.source === window) {
this.#updateFromSandbox(event.detail); this.#updateFromSandbox(event.detail);
} }
}); },
this._internalEvents.set("dispatcheventinsandbox", event => { { signal }
);
eventBus._on(
"dispatcheventinsandbox",
event => {
this.#scripting?.dispatchEventInSandbox(event.detail); this.#scripting?.dispatchEventInSandbox(event.detail);
}); },
{ signal }
);
this._internalEvents.set("pagechanging", ({ pageNumber, previous }) => { eventBus._on(
"pagechanging",
({ pageNumber, previous }) => {
if (pageNumber === previous) { if (pageNumber === previous) {
return; // The current page didn't change. return; // The current page didn't change.
} }
this.#dispatchPageClose(previous); this.#dispatchPageClose(previous);
this.#dispatchPageOpen(pageNumber); this.#dispatchPageOpen(pageNumber);
}); },
this._internalEvents.set("pagerendered", ({ pageNumber }) => { { signal }
);
eventBus._on(
"pagerendered",
({ pageNumber }) => {
if (!this._pageOpenPending.has(pageNumber)) { if (!this._pageOpenPending.has(pageNumber)) {
return; // No pending "PageOpen" event for the newly rendered page. return; // No pending "PageOpen" event for the newly rendered page.
} }
@ -133,8 +153,12 @@ class PDFScriptingManager {
return; // The newly rendered page is no longer the current one. return; // The newly rendered page is no longer the current one.
} }
this.#dispatchPageOpen(pageNumber); this.#dispatchPageOpen(pageNumber);
}); },
this._internalEvents.set("pagesdestroy", async () => { { signal }
);
eventBus._on(
"pagesdestroy",
async () => {
await this.#dispatchPageClose(this.#pdfViewer.currentPageNumber); await this.#dispatchPageClose(this.#pdfViewer.currentPageNumber);
await this.#scripting?.dispatchEventInSandbox({ await this.#scripting?.dispatchEventInSandbox({
@ -143,11 +167,9 @@ class PDFScriptingManager {
}); });
this.#closeCapability?.resolve(); this.#closeCapability?.resolve();
}); },
{ signal }
for (const [name, listener] of this._internalEvents) { );
this.#eventBus._on(name, listener);
}
try { try {
const docProperties = await this.#docProperties(pdfDocument); const docProperties = await this.#docProperties(pdfDocument);
@ -168,7 +190,7 @@ class PDFScriptingManager {
}, },
}); });
this.#eventBus.dispatch("sandboxcreated", { source: this }); eventBus.dispatch("sandboxcreated", { source: this });
} catch (error) { } catch (error) {
console.error(`setDocument: "${error.message}".`); console.error(`setDocument: "${error.message}".`);
@ -242,13 +264,6 @@ class PDFScriptingManager {
return this.#ready; return this.#ready;
} }
/**
* @private
*/
get _internalEvents() {
return shadow(this, "_internalEvents", new Map());
}
/** /**
* @private * @private
*/ */
@ -466,10 +481,8 @@ class PDFScriptingManager {
this.#willPrintCapability?.reject(new Error("Scripting destroyed.")); this.#willPrintCapability?.reject(new Error("Scripting destroyed."));
this.#willPrintCapability = null; this.#willPrintCapability = null;
for (const [name, listener] of this._internalEvents) { this.#eventAbortController?.abort();
this.#eventBus._off(name, listener); this.#eventAbortController = null;
}
this._internalEvents.clear();
this._pageOpenPending.clear(); this._pageOpenPending.clear();
this._visitedPages.clear(); this._visitedPages.clear();