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

17
web/pdf_document_properties.js
View file

@ -45,7 +45,6 @@ function getPageName(size, isPortrait, pageNames) {
/**
* @typedef {Object} PDFDocumentPropertiesOptions
* @property {string} dialogName - Name/identifier for the dialog.
* @property {HTMLDialogElement} dialog - The overlay's DOM element.
* @property {Object} fields - Names and elements of the overlay's fields.
* @property {HTMLButtonElement} closeButton - Button for closing the overlay.
@ -60,13 +59,7 @@ class PDFDocumentProperties {
* @param {EventBus} eventBus - The application event bus.
* @param {IL10n} l10n - Localization service.
*/
constructor(
{ dialogName, dialog, fields, closeButton },
overlayManager,
eventBus,
l10n
) {
this.dialogName = dialogName;
constructor({ dialog, fields, closeButton }, overlayManager, eventBus, l10n) {
this.dialog = dialog;
this.fields = fields;
this.overlayManager = overlayManager;
@ -76,7 +69,7 @@ class PDFDocumentProperties {
// Bind the event listener for the Close button.
closeButton.addEventListener("click", this.close.bind(this));
this.overlayManager.register(this.dialogName, this.dialog);
this.overlayManager.register(this.dialog);
eventBus._on("pagechanging", evt => {
this._currentPageNumber = evt.pageNumber;
@ -96,7 +89,7 @@ class PDFDocumentProperties {
*/
async open() {
await Promise.all([
this.overlayManager.open(this.dialogName),
this.overlayManager.open(this.dialog),
this._dataAvailableCapability.promise,
]);
const currentPageNumber = this._currentPageNumber;
@ -176,7 +169,7 @@ class PDFDocumentProperties {
* Close the document properties overlay.
*/
async close() {
this.overlayManager.close(this.dialogName);
this.overlayManager.close(this.dialog);
}
/**
@ -224,7 +217,7 @@ class PDFDocumentProperties {
}
return;
}
if (this.overlayManager.active !== this.dialogName) {
if (this.overlayManager.active !== this.dialog) {
// Don't bother updating the dialog if has already been closed,
// since it will be updated the next time `this.open` is called.
return;