diff --git a/app/src/config/account.ts b/app/src/config/account.ts index ea091c72e..d93eeaf77 100644 --- a/app/src/config/account.ts +++ b/app/src/config/account.ts @@ -299,7 +299,7 @@ ${window.siyuan.languages.account8}`; userPassword: md5(userPasswordElement.value), captcha: captchaElement.value.replace(/(^\s*)|(\s*$)/g, ""), }, (data) => { - let messageId + let messageId; if (data.code === 1) { messageId = showMessage(data.msg); if (data.data.needCaptcha) { diff --git a/app/src/config/exportConfig.ts b/app/src/config/exportConfig.ts index d9a8c1792..da7aedaad 100644 --- a/app/src/config/exportConfig.ts +++ b/app/src/config/exportConfig.ts @@ -166,7 +166,7 @@ export const exportConfig = { fetchPost("/api/export/exportDataInFolder", { folder: result.filePath }, () => { - hideMessage(id) + hideMessage(id); afterExport(result.filePath); }); } diff --git a/app/src/config/keymap.ts b/app/src/config/keymap.ts index 5bc670653..fec0bc605 100644 --- a/app/src/config/keymap.ts +++ b/app/src/config/keymap.ts @@ -1,6 +1,6 @@ import {hotKey2Electron, isCtrl, isMac, updateHotkeyTip} from "../protyle/util/compatibility"; import {Constants} from "../constants"; -import {hideMessage, showMessage} from "../dialog/message"; +import {showMessage} from "../dialog/message"; import {fetchPost} from "../util/fetch"; import {ipcRenderer} from "electron"; diff --git a/app/src/dialog/message.ts b/app/src/dialog/message.ts index c7ad376e1..93fc538b2 100644 --- a/app/src/dialog/message.ts +++ b/app/src/dialog/message.ts @@ -1,29 +1,29 @@ import {genUUID} from "../util/genID"; export const initMessage = () => { - const messageElement = document.getElementById("message") + const messageElement = document.getElementById("message"); messageElement.innerHTML = `
` +`; messageElement.addEventListener("click", (event) => { - let target = event.target as HTMLElement + let target = event.target as HTMLElement; while (target && !target.isEqualNode(messageElement)) { if (target.classList.contains("b3-snackbar__close")) { - hideMessage(target.parentElement.getAttribute("data-id")) + hideMessage(target.parentElement.getAttribute("data-id")); event.preventDefault(); break; } else if (target.isSameNode(messageElement.lastElementChild)) { target.parentElement.classList.add("fn__none"); - target.parentElement.innerHTML = ''; + target.parentElement.innerHTML = ""; event.preventDefault(); break; } target = target.parentElement; } - }) -} + }); +}; export const showMessage = (message: string, timeout = 6000, type = "info") => { const id = genUUID(); @@ -35,9 +35,9 @@ export const showMessage = (message: string, timeout = 6000, type = "info") => { hideMessage(id); }, timeout); } - const messagesElement = document.getElementById("message").firstElementChild + const messagesElement = document.getElementById("message").firstElementChild; if (messagesElement.childElementCount === 0) { - messagesElement.parentElement.classList.remove("fn__none") + messagesElement.parentElement.classList.remove("fn__none"); } messagesElement.insertAdjacentHTML("afterbegin", messageHTML + ""); messagesElement.scrollTop = 0; @@ -45,12 +45,12 @@ export const showMessage = (message: string, timeout = 6000, type = "info") => { }; export const hideMessage = (id: string) => { - const messagesElement = document.getElementById("message").firstElementChild + const messagesElement = document.getElementById("message").firstElementChild; const messageElement = messagesElement.querySelector(`[data-id="${id}"]`); if (messageElement) { messageElement.remove(); } if (messagesElement.childElementCount === 0) { - messagesElement.parentElement.classList.add("fn__none") + messagesElement.parentElement.classList.add("fn__none"); } }; diff --git a/app/src/index.ts b/app/src/index.ts index 10e2ed14e..a14ebe32c 100644 --- a/app/src/index.ts +++ b/app/src/index.ts @@ -13,7 +13,7 @@ import {repos} from "./config/repos"; import {openFileById} from "./editor/util"; import {bootSync, downloadProgress, progressLoading, setTitle, transactionError} from "./dialog/processSystem"; import {promiseTransactions} from "./protyle/wysiwyg/transaction"; -import {initMessage, showMessage} from "./dialog/message"; +import {initMessage} from "./dialog/message"; class App { constructor() { diff --git a/app/src/layout/dock/Files.ts b/app/src/layout/dock/Files.ts index f1ac67b20..4e7164161 100644 --- a/app/src/layout/dock/Files.ts +++ b/app/src/layout/dock/Files.ts @@ -8,7 +8,7 @@ import {newFile} from "../../util/newFile"; import {initFileMenu, initNavigationMenu} from "../../menus/navigation"; import {MenuItem} from "../../menus/Menu"; import {Editor} from "../../editor"; -import {hideMessage, showMessage} from "../../dialog/message"; +import {showMessage} from "../../dialog/message"; import {fetchPost} from "../../util/fetch"; import {openEmojiPanel, unicode2Emoji} from "../../emoji"; import {newNotebook} from "../../util/mount"; diff --git a/app/src/mobile/util/MobileFiles.ts b/app/src/mobile/util/MobileFiles.ts index 59e4bb4e8..5d4d14b45 100644 --- a/app/src/mobile/util/MobileFiles.ts +++ b/app/src/mobile/util/MobileFiles.ts @@ -5,7 +5,7 @@ import {Constants} from "../../constants"; import {getDisplayName, pathPosix, setNoteBook} from "../../util/pathName"; import {newFile} from "../../util/newFile"; import {initFileMenu, initNavigationMenu} from "../../menus/navigation"; -import {hideMessage, showMessage} from "../../dialog/message"; +import {showMessage} from "../../dialog/message"; import {fetchPost} from "../../util/fetch"; import {genUUID} from "../../util/genID"; import {openMobileFileById} from "../editor"; diff --git a/app/src/protyle/breadcrumb/index.ts b/app/src/protyle/breadcrumb/index.ts index 6a243e1ff..74b63095d 100644 --- a/app/src/protyle/breadcrumb/index.ts +++ b/app/src/protyle/breadcrumb/index.ts @@ -166,7 +166,7 @@ export class Breadcrumb { icon: "iconRecord", label: this.mediaRecorder?.isRecording ? window.siyuan.languages.endRecord : window.siyuan.languages.startRecord, click: () => { - let messageId = '' + let messageId = ""; if (!this.mediaRecorder) { navigator.mediaDevices.getUserMedia({audio: true}).then((mediaStream: MediaStream) => { this.mediaRecorder = new RecordMedia(mediaStream); diff --git a/app/src/protyle/header/Background.ts b/app/src/protyle/header/Background.ts index 2e9f20612..f4e401a05 100644 --- a/app/src/protyle/header/Background.ts +++ b/app/src/protyle/header/Background.ts @@ -2,7 +2,6 @@ import {hasClosestByClassName} from "../util/hasClosest"; import {getRandom, isMobile} from "../../util/functions"; import {hideElements} from "../ui/hideElements"; import {uploadFiles} from "../upload"; -import {hideMessage} from "../../dialog/message"; import {fetchPost} from "../../util/fetch"; import {getRandomEmoji, openEmojiPanel, unicode2Emoji, updateFileTreeEmoji, updateOutlineEmoji} from "../../emoji"; import {upDownHint} from "../../util/upDownHint"; diff --git a/app/src/protyle/upload/index.ts b/app/src/protyle/upload/index.ts index c9e2caac5..6dffba356 100644 --- a/app/src/protyle/upload/index.ts +++ b/app/src/protyle/upload/index.ts @@ -1,5 +1,5 @@ import {insertHTML} from "../util/insertHTML"; -import {hideMessage, showMessage} from "../../dialog/message"; +import {showMessage} from "../../dialog/message"; import {Constants} from "../../constants"; import {destroy} from "../util/destroy"; import {fetchPost} from "../../util/fetch"; diff --git a/app/src/util/processMessage.ts b/app/src/util/processMessage.ts index 6fcb1479b..d34115ef9 100644 --- a/app/src/util/processMessage.ts +++ b/app/src/util/processMessage.ts @@ -1,4 +1,4 @@ -import {hideMessage, showMessage} from "../dialog/message"; +import {showMessage} from "../dialog/message"; import {exportLayout} from "../layout/util"; import {isMobile} from "./functions";