From fae96fd141b4049fe3aa103baccf9b008bbbb035 Mon Sep 17 00:00:00 2001 From: Vanessa Date: Thu, 27 Oct 2022 23:06:50 +0800 Subject: [PATCH] :rotating_light: --- app/src/config/appearance.ts | 5 ++--- app/src/config/util/colorPicker.ts | 12 ++++++------ app/src/config/util/snippets.ts | 2 +- app/src/protyle/wysiwyg/index.ts | 2 +- 4 files changed, 10 insertions(+), 11 deletions(-) diff --git a/app/src/config/appearance.ts b/app/src/config/appearance.ts index daa72ddcb..247006e98 100644 --- a/app/src/config/appearance.ts +++ b/app/src/config/appearance.ts @@ -211,10 +211,10 @@ export const appearance = { }, bindEvent: () => { appearance.element.querySelector("#codeSnippet").addEventListener("click", () => { - openSnippets() + openSnippets(); }); appearance.element.querySelector("#appearanceCustomSetting").addEventListener("click", () => { - openColorPicker() + openColorPicker(); }); appearance.element.querySelector("#resetLayout").addEventListener("click", () => { fetchPost("/api/system/setUILayout", {layout: {}}, () => { @@ -253,7 +253,6 @@ export const appearance = { } window.siyuan.config.appearance = data; if (appearance.element) { - const theme = data.mode === 0 ? data.themeLight : data.themeDark; const modeElement = appearance.element.querySelector("#mode") as HTMLSelectElement; if (modeElement) { if (data.modeOS) { diff --git a/app/src/config/util/colorPicker.ts b/app/src/config/util/colorPicker.ts index e97cbcc14..c30d76d96 100644 --- a/app/src/config/util/colorPicker.ts +++ b/app/src/config/util/colorPicker.ts @@ -3,7 +3,7 @@ import {Dialog} from "../../dialog"; import * as Pickr from "@simonwep/pickr"; export const openColorPicker = () => { - const theme = window.siyuan.config.appearance.mode === 0 ? window.siyuan.config.appearance.themeLight : window.siyuan.config.appearance.themeDark + const theme = window.siyuan.config.appearance.mode === 0 ? window.siyuan.config.appearance.themeLight : window.siyuan.config.appearance.themeDark; fetchPost("/api/setting/getCustomCSS", { theme }, response => { @@ -26,7 +26,7 @@ export const openColorPicker = () => {
` - }) + }); const pickrs: Record> = {}; dialog.element.querySelectorAll(".colorPicker").forEach((item: HTMLInputElement) => { // @ts-ignore @@ -52,8 +52,8 @@ export const openColorPicker = () => { pickrs[key][item.getAttribute("data-subkey")] = pickr; }); dialog.element.querySelector(".b3-button--cancel").addEventListener("click", () => { - dialog.destroy() - }) + dialog.destroy(); + }); dialog.element.querySelector(".b3-button--text").addEventListener("click", () => { const css: Record> = {}; Object.keys(pickrs).forEach((item) => { @@ -66,7 +66,7 @@ export const openColorPicker = () => { theme, css }); - dialog.destroy() + dialog.destroy(); }); }); -} +}; diff --git a/app/src/config/util/snippets.ts b/app/src/config/util/snippets.ts index 0f038f736..465743a52 100644 --- a/app/src/config/util/snippets.ts +++ b/app/src/config/util/snippets.ts @@ -106,7 +106,7 @@ export const openSnippets = () => { type: item.getAttribute("data-type"), content: item.querySelector("textarea").value, enabled: (item.querySelector(".b3-switch") as HTMLInputElement).checked - }) + }); }); fetchPost("/api/snippet/setSnippet", {snippets}, () => { renderSnippet(); diff --git a/app/src/protyle/wysiwyg/index.ts b/app/src/protyle/wysiwyg/index.ts index af1e91629..9c2729a9a 100644 --- a/app/src/protyle/wysiwyg/index.ts +++ b/app/src/protyle/wysiwyg/index.ts @@ -197,7 +197,7 @@ export class WYSIWYG { } event.stopPropagation(); event.preventDefault(); - window.siyuan.ctrlIsPressed = false // https://github.com/siyuan-note/siyuan/issues/6373 + window.siyuan.ctrlIsPressed = false; // https://github.com/siyuan-note/siyuan/issues/6373 const range = getEditorRange(protyle.wysiwyg.element); const nodeElement = hasClosestBlock(range.startContainer); if (!nodeElement) {