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

🚨

Browse source
This commit is contained in:
Vanessa 2022-10-09 21:46:22 +08:00
parent 221a144f68
commit 8fb74b6d31
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/config/repos.ts
View file

@ -156,7 +156,7 @@ ${syncModeHTML}
});
const switchConflictElement = repos.element.querySelector("#generateConflictDoc") as HTMLInputElement;
switchConflictElement.addEventListener("change", () => {
fetchPost("/api/sync/setSyncGenerateConflictDoc", {enabled: switchConflictElement.checked}, (response) => {
fetchPost("/api/sync/setSyncGenerateConflictDoc", {enabled: switchConflictElement.checked}, () => {
window.siyuan.config.sync.generateConflictDoc = switchConflictElement.checked;
});
});

12
app/src/util/globalShortcut.ts
View file

@ -100,12 +100,12 @@ export const globalShortcut = () => {
if (!targetBlockElement) {
return;
}
const allModels = getAllModels()
let findNode = false
const allModels = getAllModels();
let findNode = false;
allModels.editor.find(item => {
if (item.editor.protyle.wysiwyg.element.isSameNode(eventPath0)) {
item.editor.protyle.gutter.render(targetBlockElement, item.editor.protyle.wysiwyg.element);
findNode = true
findNode = true;
return true;
}
});
@ -128,7 +128,7 @@ export const globalShortcut = () => {
item.editors.find(eItem => {
if (eItem.protyle.wysiwyg.element.isSameNode(eventPath0)) {
eItem.protyle.gutter.render(targetBlockElement, eItem.protyle.wysiwyg.element);
findNode = true
findNode = true;
return true;
}
});
@ -151,7 +151,7 @@ export const globalShortcut = () => {
allModels.editor.find(item => {
if (item.editor.protyle.wysiwyg.element.contains(eventPath0)) {
item.editor.protyle.gutter.render(targetBlockElement, item.editor.protyle.wysiwyg.element);
findNode = true
findNode = true;
return true;
}
});
@ -174,7 +174,7 @@ export const globalShortcut = () => {
item.editors.find(eItem => {
if (eItem.protyle.wysiwyg.element.contains(eventPath0)) {
eItem.protyle.gutter.render(targetBlockElement, eItem.protyle.wysiwyg.element);
findNode = true
findNode = true;
return true;
}
});