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

Re-factor the OverlayManager class to use a WeakMap internally

Browse source 
This way we're able to store the `<dialog>` elements directly, which removes the need to use manually specified name-strings thus simplifying both the `OverlayManager` itself and its calling code.
This commit is contained in:
Jonas Jenwald 2022-03-25 14:10:22 +01:00
parent f0aa08b464
commit 923bd52cdb
6 changed files with 48 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

14
web/password_prompt.js
View file

@ -17,7 +17,6 @@ import { PasswordResponses } from "pdfjs-lib";
/**
* @typedef {Object} PasswordPromptOptions
* @property {string} dialogName - Name/identifier for the dialog.
* @property {HTMLDialogElement} dialog - The overlay's DOM element.
* @property {HTMLParagraphElement} label - Label containing instructions for
* entering the password.
@ -41,7 +40,6 @@ class PasswordPrompt {
* an <iframe> or an <object>. The default value is `false`.
*/
constructor(options, overlayManager, l10n, isViewerEmbedded = false) {
this.dialogName = options.dialogName;
this.dialog = options.dialog;
this.label = options.label;
this.input = options.input;
@ -60,17 +58,13 @@ class PasswordPrompt {
}
});
this.overlayManager.register(
this.dialogName,
this.dialog,
/* canForceClose = */ true
);
this.overlayManager.register(this.dialog, /* canForceClose = */ true);
this.dialog.addEventListener("close", this.#cancel.bind(this));
}
async open() {
await this.overlayManager.open(this.dialogName);
await this.overlayManager.open(this.dialog);
const passwordIncorrect =
this.#reason === PasswordResponses.INCORRECT_PASSWORD;
@ -84,8 +78,8 @@ class PasswordPrompt {
}
async close() {
if (this.overlayManager.active === this.dialogName) {
this.overlayManager.close(this.dialogName);
if (this.overlayManager.active === this.dialog) {
this.overlayManager.close(this.dialog);
}
}