GitHub/Anki
1
0
Fork 0
mirror of https://github.com/ankitects/anki.git synced 2025-09-24 16:56:36 -04:00
Code Issues Projects Releases Packages 1 Wiki Activity Actions

Prevent sticky bubbling and saveField before toggling sticky

Browse source
This commit is contained in:
Henrik Giesel 2021-09-07 14:29:41 +02:00
parent 996f4c637f
commit 7370c92a0b
2 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ts/editor/editor-field.ts
View file

@ -41,11 +41,11 @@ export class EditorField extends HTMLDivElement {
} }
connectedCallback(): void { connectedCallback(): void {
this.labelContainer.addEventListener("mousedown", this.focusIfNotFocused); this.addEventListener("mousedown", this.focusIfNotFocused);
} }
disconnectedCallback(): void { disconnectedCallback(): void {
this.labelContainer.removeEventListener("mousedown", this.focusIfNotFocused); this.removeEventListener("mousedown", this.focusIfNotFocused);
} }
attributeChangedCallback(name: string, _oldValue: string, newValue: string): void { attributeChangedCallback(name: string, _oldValue: string, newValue: string): void {

15
ts/editor/label-container.ts
View file

@ -7,6 +7,7 @@ import * as tr from "lib/i18n";
import { registerShortcut } from "lib/shortcuts"; import { registerShortcut } from "lib/shortcuts";
import { bridgeCommand } from "./lib"; import { bridgeCommand } from "./lib";
import { appendInParentheses } from "./helpers"; import { appendInParentheses } from "./helpers";
import { saveField } from "./change-timer";
import { getCurrentField, forEditorField, i18n } from "."; import { getCurrentField, forEditorField, i18n } from ".";
import pinIcon from "./pin-angle.svg"; import pinIcon from "./pin-angle.svg";
@ -63,23 +64,27 @@ export class LabelContainer extends HTMLDivElement {
this.hoverIcon = this.hoverIcon.bind(this); this.hoverIcon = this.hoverIcon.bind(this);
this.removeHoverIcon = this.removeHoverIcon.bind(this); this.removeHoverIcon = this.removeHoverIcon.bind(this);
this.toggleSticky = this.toggleSticky.bind(this); this.toggleSticky = this.toggleSticky.bind(this);
this.toggleStickyEvent = this.toggleStickyEvent.bind(this);
this.keepFocus = this.keepFocus.bind(this); this.keepFocus = this.keepFocus.bind(this);
} }
keepFocus(event: Event): void { keepFocus(event: Event): void {
event.stopPropagation();
event.preventDefault(); event.preventDefault();
} }
connectedCallback(): void { connectedCallback(): void {
this.addEventListener("mousedown", this.keepFocus); this.addEventListener("mousedown", this.keepFocus);
this.sticky.addEventListener("click", this.toggleSticky); this.sticky.addEventListener("mousedown", this.keepFocus);
this.sticky.addEventListener("click", this.toggleStickyEvent);
this.sticky.addEventListener("mouseenter", this.hoverIcon); this.sticky.addEventListener("mouseenter", this.hoverIcon);
this.sticky.addEventListener("mouseleave", this.removeHoverIcon); this.sticky.addEventListener("mouseleave", this.removeHoverIcon);
} }
disconnectedCallback(): void { disconnectedCallback(): void {
this.removeEventListener("mousedown", this.keepFocus); this.removeEventListener("mousedown", this.keepFocus);
this.sticky.removeEventListener("click", this.toggleSticky); this.sticky.removeEventListener("mousedown", this.keepFocus);
this.sticky.removeEventListener("click", this.toggleStickyEvent);
this.sticky.removeEventListener("mouseenter", this.hoverIcon); this.sticky.removeEventListener("mouseenter", this.hoverIcon);
this.sticky.removeEventListener("mouseleave", this.removeHoverIcon); this.sticky.removeEventListener("mouseleave", this.removeHoverIcon);
} }
@ -106,7 +111,13 @@ export class LabelContainer extends HTMLDivElement {
} }
toggleSticky(): void { toggleSticky(): void {
saveField((this.parentElement as EditorField).editingArea, "key");
bridgeCommand(`toggleSticky:${this.getAttribute("ord")}`, this.setSticky); bridgeCommand(`toggleSticky:${this.getAttribute("ord")}`, this.setSticky);
this.removeHoverIcon(); this.removeHoverIcon();
} }
toggleStickyEvent(event: Event): void {
event.stopPropagation();
this.toggleSticky();
}
} }