mirror of
https://github.com/mozilla/pdf.js.git
synced 2025-04-19 14:48:08 +02:00
Merge pull request #17933 from Snuffleupagus/pr-17464-followup
Fix resetting of cursor-tools when closing the document (PR 17464 follow-up)
This commit is contained in:
commit
e005e6ecdd
2 changed files with 9 additions and 10 deletions
|
@ -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;
|
||||
|
||||
|
|
|
@ -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 });
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue