mirrors/pdf.js
1
0
Fork 0
mirror of https://github.com/mozilla/pdf.js.git synced 2025-04-22 16:18:08 +02:00
Code Activity

[Editor] Make sure everything is cleaned up when we switch to annotation editor mode

Browse source
This commit is contained in:
Calixte Denizet 2024-07-02 15:49:54 +02:00
parent bdcc4a0feb
commit 68175323f1
2 changed files with 16 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

29
web/pdf_viewer.js
View file

@ -1122,9 +1122,7 @@ class PDFViewer {
this.#hiddenCopyElement?.remove();
this.#hiddenCopyElement = null;
this.#onPageRenderedCallback = null;
clearTimeout(this.#switchAnnotationEditorModeTimeoutId);
this.#switchAnnotationEditorModeTimeoutId = null;
this.#cleanupSwitchAnnotationEditorMode();
}
#ensurePageViewVisible() {
@ -2263,6 +2261,17 @@ class PDFViewer {
]);
}
#cleanupSwitchAnnotationEditorMode() {
if (this.#onPageRenderedCallback) {
this.eventBus._off("pagerendered", this.#onPageRenderedCallback);
this.#onPageRenderedCallback = null;
}
if (this.#switchAnnotationEditorModeTimeoutId !== null) {
clearTimeout(this.#switchAnnotationEditorModeTimeoutId);
this.#switchAnnotationEditorModeTimeoutId = null;
}
}
get annotationEditorMode() {
return this.#annotationEditorUIManager
? this.#annotationEditorMode
@ -2296,14 +2305,7 @@ class PDFViewer {
const { eventBus } = this;
const updater = () => {
if (this.#onPageRenderedCallback) {
eventBus._off("pagerendered", this.#onPageRenderedCallback);
this.#onPageRenderedCallback = null;
}
if (this.#switchAnnotationEditorModeTimeoutId !== null) {
clearTimeout(this.#switchAnnotationEditorModeTimeoutId);
this.#switchAnnotationEditorModeTimeoutId = null;
}
this.#cleanupSwitchAnnotationEditorMode();
this.#annotationEditorMode = mode;
eventBus.dispatch("annotationeditormodechanged", {
source: this,
@ -2329,15 +2331,14 @@ class PDFViewer {
if (isEditing && editId && idsToRefresh) {
// We're editing an existing annotation so we must switch to editing
// mode when the rendering is done.
const { signal } = this.#eventAbortController;
this.#cleanupSwitchAnnotationEditorMode();
this.#onPageRenderedCallback = ({ pageNumber }) => {
idsToRefresh.delete(pageNumber);
if (idsToRefresh.size === 0) {
eventBus._off("pagerendered", this.#onPageRenderedCallback);
this.#onPageRenderedCallback = null;
this.#switchAnnotationEditorModeTimeoutId = setTimeout(updater, 0);
}
};
const { signal } = this.#eventAbortController;
eventBus._on("pagerendered", this.#onPageRenderedCallback, { signal });
return;
}