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

Fix resetting of cursor-tools when closing the document (PR 17464 follow-up)

Browse source 
With the removal of the "secondarytoolbarreset" event in PR 17464 resetting of cursor-tools state accidentally broke.
This commit is contained in:
Jonas Jenwald 2024-04-12 13:16:44 +02:00
parent e78ce74b5f
commit 60832fee27
2 changed files with 9 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

18
web/pdf_cursor_tools.js
View file

@ -106,7 +106,14 @@ class PDFCursorTools {
#addEventListeners() {
this.eventBus._on("switchcursortool", evt => {
this.switchTool(evt.tool);
if (!evt.reset) {
this.switchTool(evt.tool);
} else if (this.#prevActive !== null) {
annotationEditorMode = AnnotationEditorType.NONE;
presentationModeState = PresentationModeState.NORMAL;
enableActive();
}
});
let annotationEditorMode = AnnotationEditorType.NONE,
@ -131,15 +138,6 @@ class PDFCursorTools {
}
};
this.eventBus._on("secondarytoolbarreset", evt => {
if (this.#prevActive !== null) {
annotationEditorMode = AnnotationEditorType.NONE;
presentationModeState = PresentationModeState.NORMAL;
enableActive();
}
});
this.eventBus._on("annotationeditormodechanged", ({ mode }) => {
annotationEditorMode = mode;

1
web/secondary_toolbar.js
View file

@ -182,6 +182,7 @@ class SecondaryToolbar {
this.#updateUIState();
// Reset the Scroll/Spread buttons too, since they're document specific.
this.eventBus.dispatch("switchcursortool", { source: this, reset: true });
this.#scrollModeChanged({ mode: ScrollMode.VERTICAL });
this.#spreadModeChanged({ mode: SpreadMode.NONE });
}