diff --git a/app/src/config/repos.ts b/app/src/config/repos.ts index 8609c02ab..84b0c12d4 100644 --- a/app/src/config/repos.ts +++ b/app/src/config/repos.ts @@ -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; }); }); diff --git a/app/src/util/globalShortcut.ts b/app/src/util/globalShortcut.ts index a7ebf8dde..959b84731 100644 --- a/app/src/util/globalShortcut.ts +++ b/app/src/util/globalShortcut.ts @@ -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; } });