From 6ad89c12c1d07e7f8d670d9dcf4e14030c3f67ff Mon Sep 17 00:00:00 2001 From: Vanessa Date: Sat, 11 Feb 2023 21:34:42 +0800 Subject: [PATCH] :rotating_light: --- app/src/emoji/index.ts | 4 ++-- app/src/index.ts | 8 ++++---- app/src/layout/dock/Backlink.ts | 4 ++-- app/src/layout/dock/index.ts | 16 ++++++++-------- app/src/layout/dock/util.ts | 10 +++++----- app/src/layout/util.ts | 2 +- app/src/protyle/wysiwyg/index.ts | 2 +- app/src/search/util.ts | 8 ++++---- app/src/util/globalShortcut.ts | 16 ++++++++-------- 9 files changed, 35 insertions(+), 35 deletions(-) diff --git a/app/src/emoji/index.ts b/app/src/emoji/index.ts index a28fe06e3..a80c8bb37 100644 --- a/app/src/emoji/index.ts +++ b/app/src/emoji/index.ts @@ -79,7 +79,7 @@ export const lazyLoadEmojiImg = (element: Element) => { element.querySelectorAll("img").forEach((panelElement) => { emojiIntersectionObserver.observe(panelElement); }); -} +}; export const filterEmoji = (key = "", max?: number, assic = false) => { let html = ""; @@ -428,7 +428,7 @@ export const updateFileTreeEmoji = (unicode: string, id: string, icon = "iconFil /// #if MOBILE emojiElement = document.querySelector(`#sidebar [data-type="sidebar-file"] [data-node-id="${id}"] .b3-list-item__icon`); /// #else - const dockFile = getDockByType("file") + const dockFile = getDockByType("file"); if (dockFile) { const files = dockFile.data.file as Files; if (icon === "iconFile") { diff --git a/app/src/index.ts b/app/src/index.ts index 8384b5bf3..4964068ef 100644 --- a/app/src/index.ts +++ b/app/src/index.ts @@ -134,19 +134,19 @@ class App { window.siyuan.config.uiLayout.left = { pin: true, data: response.data.conf.uiLayout.left - } + }; window.siyuan.config.uiLayout.right = { pin: true, data: response.data.conf.uiLayout.right - } + }; window.siyuan.config.uiLayout.top = { pin: true, data: response.data.conf.uiLayout.top - } + }; window.siyuan.config.uiLayout.bottom = { pin: true, data: response.data.conf.uiLayout.bottom - } + }; } getLocalStorage(() => { fetchGet(`/appearance/langs/${window.siyuan.config.appearance.lang}.json?v=${Constants.SIYUAN_VERSION}`, (lauguages) => { diff --git a/app/src/layout/dock/Backlink.ts b/app/src/layout/dock/Backlink.ts index 2d7a1c9fa..d0de81102 100644 --- a/app/src/layout/dock/Backlink.ts +++ b/app/src/layout/dock/Backlink.ts @@ -454,11 +454,11 @@ export class Backlink extends Model { private refresh() { const element = this.element.querySelector('.block__icon[data-type="refresh"] svg'); - element.classList.add("fn__rotate") + element.classList.add("fn__rotate"); fetchPost("/api/ref/refreshBacklink", { id: this.blockId, }, () => { - element.classList.remove("fn__rotate") + element.classList.remove("fn__rotate"); this.searchBacklinks(); }); } diff --git a/app/src/layout/dock/index.ts b/app/src/layout/dock/index.ts index 1ad603157..05219eaed 100644 --- a/app/src/layout/dock/index.ts +++ b/app/src/layout/dock/index.ts @@ -46,7 +46,7 @@ export class Dock { const dockClass = (options.position === "Bottom" || options.position === "Top") ? ' class="fn__flex"' : ""; this.element.innerHTML = `
`; this.position = options.position; - this.pin = options.data.pin + this.pin = options.data.pin; this.data = {}; if (options.data.data.length === 0) { this.element.firstElementChild.innerHTML = ` @@ -92,9 +92,9 @@ export class Dock { } else { this.layout.element.setAttribute("style", `height:${this.layout.element.clientHeight}px;left:0;right:0;${this.position === "Top" ? ("top:" + (1 + this.element.clientHeight + document.getElementById("toolbar").clientHeight) + "px") : ("bottom:" + (this.element.clientHeight + document.getElementById("status").clientHeight) + "px")};`); } - target.setAttribute("aria-label", window.siyuan.languages.pin) + target.setAttribute("aria-label", window.siyuan.languages.pin); } else { - target.setAttribute("aria-label", window.siyuan.languages.unpin) + target.setAttribute("aria-label", window.siyuan.languages.unpin); } target.classList.toggle("dock__item--pin"); this.layout.element.classList.toggle("layout--float"); @@ -107,7 +107,7 @@ export class Dock { }); this.layout.element.addEventListener("mouseleave", (event) => { if (this.pin) { - return + return; } if (this.position === "Left" && event.clientX < 43) { return; @@ -121,8 +121,8 @@ export class Dock { if (this.position === "Bottom" && event.clientY > window.innerHeight - 73) { return; } - this.hideDock() - }) + this.hideDock(); + }); if (window.siyuan.config.uiLayout.hideDock) { this.element.classList.add("fn__none"); } @@ -131,7 +131,7 @@ export class Dock { if (this.position === "Left" || this.position === "Right") { this.layout.element.setAttribute("style", `opacity:0px;width:${this.layout.element.clientWidth}px;${this.position === "Right" ? "right" : "left"}:-${this.layout.element.clientWidth}px; top: ${1 + document.getElementById("toolbar").clientHeight + document.getElementById("dockTop").clientHeight}px; bottom: ${document.getElementById("status").clientHeight + document.getElementById("dockBottom").clientHeight + 1}px;`); } else { - this.layout.element.setAttribute("style", `opacity:0px;height:${this.layout.element.clientHeight}px;left:0;right:0;${this.position === "Top" ? "top" : "bottom"}:-${this.layout.element.clientHeight}px;`) + this.layout.element.setAttribute("style", `opacity:0px;height:${this.layout.element.clientHeight}px;left:0;right:0;${this.position === "Top" ? "top" : "bottom"}:-${this.layout.element.clientHeight}px;`); } this.layout.element.classList.add("layout--float"); this.resizeElement.classList.add("fn__none"); @@ -141,7 +141,7 @@ export class Dock { public hideDock() { if (this.layout.element.style.opacity === "0") { - return + return; } this.layout.element.style.opacity = "0"; if (this.position === "Left") { diff --git a/app/src/layout/dock/util.ts b/app/src/layout/dock/util.ts index b0c1f6cc7..82a0f7a25 100644 --- a/app/src/layout/dock/util.ts +++ b/app/src/layout/dock/util.ts @@ -91,20 +91,20 @@ export const resetFloatDockSize = () => { window.siyuan.layout.leftDock.layout.element.style.top = (1 + document.getElementById("toolbar").clientHeight + document.getElementById("dockTop").clientHeight) + "px"; window.siyuan.layout.leftDock.layout.element.style.bottom = (document.getElementById("status").clientHeight + document.getElementById("dockBottom").clientHeight + 1) + "px"; if (window.siyuan.layout.leftDock.layout.element.style.opacity === "1") { - window.siyuan.layout.leftDock.layout.element.style.left = (window.siyuan.layout.leftDock.element.clientWidth + .5) + "px" + window.siyuan.layout.leftDock.layout.element.style.left = (window.siyuan.layout.leftDock.element.clientWidth + .5) + "px"; } } if (!window.siyuan.layout.rightDock.pin) { window.siyuan.layout.rightDock.layout.element.style.top = (1 + document.getElementById("toolbar").clientHeight + document.getElementById("dockTop").clientHeight) + "px"; window.siyuan.layout.rightDock.layout.element.style.bottom = (document.getElementById("status").clientHeight + document.getElementById("dockBottom").clientHeight + 1) + "px"; if (window.siyuan.layout.rightDock.layout.element.style.opacity === "1") { - window.siyuan.layout.rightDock.layout.element.style.right = (window.siyuan.layout.rightDock.element.clientWidth + .5) + "px" + window.siyuan.layout.rightDock.layout.element.style.right = (window.siyuan.layout.rightDock.element.clientWidth + .5) + "px"; } } if (!window.siyuan.layout.topDock.pin && window.siyuan.layout.topDock.layout.element.style.opacity === "1") { - window.siyuan.layout.topDock.layout.element.style.top = (document.getElementById("dockTop").clientHeight + document.getElementById("toolbar").clientHeight + 1) + "px" + window.siyuan.layout.topDock.layout.element.style.top = (document.getElementById("dockTop").clientHeight + document.getElementById("toolbar").clientHeight + 1) + "px"; } if (!window.siyuan.layout.bottomDock.pin && window.siyuan.layout.bottomDock.layout.element.style.opacity === "1") { - window.siyuan.layout.bottomDock.layout.element.style.bottom = (document.getElementById("dockBottom").clientHeight + document.getElementById("status").clientHeight + 1) + "px" + window.siyuan.layout.bottomDock.layout.element.style.bottom = (document.getElementById("dockBottom").clientHeight + document.getElementById("status").clientHeight + 1) + "px"; } -} +}; diff --git a/app/src/layout/util.ts b/app/src/layout/util.ts index 1f1a12c68..a9748f0d5 100644 --- a/app/src/layout/util.ts +++ b/app/src/layout/util.ts @@ -138,7 +138,7 @@ const dockToJSON = (dock: Dock) => { return { pin: dock.pin, data: json - } + }; }; export const resetLayout = () => { diff --git a/app/src/protyle/wysiwyg/index.ts b/app/src/protyle/wysiwyg/index.ts index 40078f2e8..eb2735477 100644 --- a/app/src/protyle/wysiwyg/index.ts +++ b/app/src/protyle/wysiwyg/index.ts @@ -1478,7 +1478,7 @@ export class WYSIWYG { let shiftStartElement: HTMLElement; this.element.addEventListener("click", (event: MouseEvent & { target: HTMLElement }) => { hideElements(["hint", "util"], protyle); - const ctrlIsPressed = event.metaKey || event.ctrlKey + const ctrlIsPressed = event.metaKey || event.ctrlKey; /// #if !MOBILE const backlinkBreadcrumbItemElement = hasClosestByClassName(event.target, "protyle-breadcrumb__item"); if (backlinkBreadcrumbItemElement) { diff --git a/app/src/search/util.ts b/app/src/search/util.ts index 35a030e2f..919c02eb5 100644 --- a/app/src/search/util.ts +++ b/app/src/search/util.ts @@ -903,19 +903,19 @@ const updateConfig = (element: Element, item: ISearchOption, config: ISearchOpti } (element.querySelector("#searchInput") as HTMLInputElement).value = item.k; (element.querySelector("#replaceInput") as HTMLInputElement).value = item.r; - let methodTip = window.siyuan.languages.searchMethod + " " + let methodTip = window.siyuan.languages.searchMethod + " "; switch (item.method) { case 0: methodTip += window.siyuan.languages.keyword; break; case 1: - methodTip += window.siyuan.languages.querySyntax + methodTip += window.siyuan.languages.querySyntax; break; case 2: - methodTip += "SQL" + methodTip += "SQL"; break; case 3: - methodTip += window.siyuan.languages.regex + methodTip += window.siyuan.languages.regex; break; } element.querySelector("#searchSyntaxCheck").setAttribute("aria-label", methodTip); diff --git a/app/src/util/globalShortcut.ts b/app/src/util/globalShortcut.ts index 4560584be..3442e56b2 100644 --- a/app/src/util/globalShortcut.ts +++ b/app/src/util/globalShortcut.ts @@ -103,8 +103,8 @@ export const globalShortcut = () => { if (!hasClosestByClassName(event.target as HTMLElement, "b3-menu") && !hasClosestByClassName(event.target as HTMLElement, "layout--float") && window.siyuan.layout.leftDock.layout.element.style.opacity !== "1") { - window.siyuan.layout.leftDock.layout.element.style.left = (window.siyuan.layout.leftDock.element.clientWidth + .5) + "px" - window.siyuan.layout.leftDock.layout.element.style.opacity = "1" + window.siyuan.layout.leftDock.layout.element.style.left = (window.siyuan.layout.leftDock.element.clientWidth + .5) + "px"; + window.siyuan.layout.leftDock.layout.element.style.opacity = "1"; } } else { window.siyuan.layout.leftDock.hideDock(); @@ -115,8 +115,8 @@ export const globalShortcut = () => { if (event.clientY > document.getElementById("toolbar").clientHeight + document.getElementById("dockTop").clientHeight && event.clientY < window.innerHeight - document.getElementById("status").clientHeight - document.getElementById("dockBottom").clientHeight) { if (!hasClosestByClassName(event.target as HTMLElement, "layout--float") && window.siyuan.layout.rightDock.layout.element.style.opacity !== "1") { - window.siyuan.layout.rightDock.layout.element.style.right = (window.siyuan.layout.rightDock.element.clientWidth + .5) + "px" - window.siyuan.layout.rightDock.layout.element.style.opacity = "1" + window.siyuan.layout.rightDock.layout.element.style.right = (window.siyuan.layout.rightDock.element.clientWidth + .5) + "px"; + window.siyuan.layout.rightDock.layout.element.style.opacity = "1"; } } else { window.siyuan.layout.rightDock.hideDock(); @@ -126,13 +126,13 @@ export const globalShortcut = () => { if (event.clientY < 75) { if (!window.siyuan.layout.topDock.pin && window.siyuan.layout.topDock.layout.element.style.opacity !== "1") { - window.siyuan.layout.topDock.layout.element.style.top = (document.getElementById("dockTop").clientHeight + document.getElementById("toolbar").clientHeight + 1) + "px" - window.siyuan.layout.topDock.layout.element.style.opacity = "1" + window.siyuan.layout.topDock.layout.element.style.top = (document.getElementById("dockTop").clientHeight + document.getElementById("toolbar").clientHeight + 1) + "px"; + window.siyuan.layout.topDock.layout.element.style.opacity = "1"; } } else if (event.clientY > window.innerHeight - 73) { if (!window.siyuan.layout.bottomDock.pin && window.siyuan.layout.bottomDock.layout.element.style.opacity !== "1") { - window.siyuan.layout.bottomDock.layout.element.style.bottom = (document.getElementById("dockBottom").clientHeight + document.getElementById("status").clientHeight + 1) + "px" - window.siyuan.layout.bottomDock.layout.element.style.opacity = "1" + window.siyuan.layout.bottomDock.layout.element.style.bottom = (document.getElementById("dockBottom").clientHeight + document.getElementById("status").clientHeight + 1) + "px"; + window.siyuan.layout.bottomDock.layout.element.style.opacity = "1"; } }