Merge pull request #18605 from Snuffleupagus/issue-18196

Handle the "switchannotationeditorparams" event in the editor-code (issue 18196)
mozilla · Aug 13, 2024 · 8446d3a · 8446d3a
2 parents 038e482 + 9e0c6ef
commit 8446d3a
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 26 deletions.
diff --git a/src/display/editor/tools.js b/src/display/editor/tools.js
@@ -776,21 +776,18 @@ class AnnotationEditorUIManager {
     this.#viewer = viewer;
     this.#altTextManager = altTextManager;
     this._eventBus = eventBus;
-    this._eventBus._on("editingaction", this.onEditingAction.bind(this), {
-      signal,
-    });
-    this._eventBus._on("pagechanging", this.onPageChanging.bind(this), {
-      signal,
-    });
-    this._eventBus._on("scalechanging", this.onScaleChanging.bind(this), {
-      signal,
-    });
-    this._eventBus._on("rotationchanging", this.onRotationChanging.bind(this), {
-      signal,
-    });
-    this._eventBus._on("setpreference", this.onSetPreference.bind(this), {
+    eventBus._on("editingaction", this.onEditingAction.bind(this), { signal });
+    eventBus._on("pagechanging", this.onPageChanging.bind(this), { signal });
+    eventBus._on("scalechanging", this.onScaleChanging.bind(this), { signal });
+    eventBus._on("rotationchanging", this.onRotationChanging.bind(this), {
       signal,
     });
+    eventBus._on("setpreference", this.onSetPreference.bind(this), { signal });
+    eventBus._on(
+      "switchannotationeditorparams",
+      evt => this.updateParams(evt.type, evt.value),
+      { signal }
+    );
     this.#addSelectionListener();
     this.#addDragAndDropListeners();
     this.#addKeyboardManager();

diff --git a/web/app.js b/web/app.js
@@ -1939,11 +1939,6 @@ const PDFViewerApplication = {
       evt => (pdfViewer.annotationEditorMode = evt),
       { signal }
     );
-    eventBus._on(
-      "switchannotationeditorparams",
-      evt => (pdfViewer.annotationEditorParams = evt),
-      { signal }
-    );
     eventBus._on("print", this.triggerPrinting.bind(this), { signal });
     eventBus._on("download", this.downloadOrSave.bind(this), { signal });
     eventBus._on("firstpage", () => (this.page = 1), { signal });

diff --git a/web/pdf_viewer.js b/web/pdf_viewer.js
@@ -2363,14 +2363,6 @@ class PDFViewer {
     updater();
   }
 
-  // eslint-disable-next-line accessor-pairs
-  set annotationEditorParams({ type, value }) {
-    if (!this.#annotationEditorUIManager) {
-      throw new Error(`The AnnotationEditor is not enabled.`);
-    }
-    this.#annotationEditorUIManager.updateParams(type, value);
-  }
-
   refresh(noUpdate = false, updateArgs = Object.create(null)) {
     if (!this.pdfDocument) {
       return;