0ct0pu5/siyuan
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

🎨 https://github.com/siyuan-note/siyuan/issues/8913

Browse source
This commit is contained in:
Vanessa 2023-08-16 13:31:37 +08:00
parent dd7679eac6
commit eb22eb9fb9
2 changed files with 25 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
app/src/boot/globalShortcut.ts
View file

@ -679,6 +679,19 @@ export const globalShortcut = (app: App) => {
event.preventDefault();
return;
}
// https://github.com/siyuan-note/siyuan/issues/8913#issuecomment-1679720605
const confirmElement = document.querySelector("#confirmDialogConfirmBtn");
if (confirmElement) {
if (event.key === "Enter") {
confirmElement.dispatchEvent(new CustomEvent("click"));
event.preventDefault();
return;
} else if (event.key === "Escape") {
confirmElement.previousElementSibling.previousElementSibling.dispatchEvent(new CustomEvent("click"));
event.preventDefault();
return;
}
}
if (event.key === "Escape" && !event.isComposing) {
const imgPreviewElement = document.querySelector(".protyle-img");
@ -761,13 +774,6 @@ export const globalShortcut = (app: App) => {
return;
}
const confirmElement = document.querySelector("#confirmDialogConfirmBtn");
if (confirmElement && event.key === "Enter") {
confirmElement.dispatchEvent(new CustomEvent("click"));
event.preventDefault();
return;
}
// close tab
if (matchHotKey(window.siyuan.config.keymap.general.closeTab.custom, event) && !event.repeat) {
event.preventDefault();

14
app/src/dialog/index.ts
View file

@ -87,15 +87,25 @@ export class Dialog {
event.preventDefault();
return;
}
const confirmElement = document.querySelector("#confirmDialogConfirmBtn");
if (event.key === "Escape") {
this.destroy();
if (confirmElement) {
confirmElement.previousElementSibling.previousElementSibling.dispatchEvent(new CustomEvent("click"));
} else {
this.destroy();
}
event.preventDefault();
event.stopPropagation();
return;
}
if (!event.shiftKey && !isCtrl(event) && event.key === "Enter" && enterEvent) {
enterEvent();
if (confirmElement) {
confirmElement.dispatchEvent(new CustomEvent("click"));
} else {
enterEvent();
}
event.preventDefault();
event.stopPropagation();
}
});
}