From 553891defb85b3af7c03654ebc27e57a5b313047 Mon Sep 17 00:00:00 2001 From: Vanessa Date: Mon, 9 Dec 2024 10:20:40 +0800 Subject: [PATCH] :rotating_light: --- app/electron/main.js | 2 +- app/src/asset/anno.ts | 14 +++++++------- app/src/block/popover.ts | 4 ++-- app/src/boot/globalEvent/keydown.ts | 2 +- app/src/history/history.ts | 4 ++-- app/src/layout/dock/Backlink.ts | 12 ++++++------ app/src/protyle/header/Background.ts | 2 +- app/src/protyle/render/av/cell.ts | 2 +- app/src/protyle/render/av/col.ts | 2 +- app/src/protyle/render/av/date.ts | 20 ++++++++++---------- app/src/protyle/render/av/select.ts | 2 +- app/src/protyle/render/searchMarkRender.ts | 14 +++++++------- app/src/protyle/util/insertHTML.ts | 2 +- app/src/protyle/util/reload.ts | 2 +- app/src/protyle/util/table.ts | 2 +- app/src/protyle/wysiwyg/index.ts | 2 +- app/src/search/util.ts | 4 ++-- 17 files changed, 46 insertions(+), 46 deletions(-) diff --git a/app/electron/main.js b/app/electron/main.js index c912e3b86..6f627a8e2 100644 --- a/app/electron/main.js +++ b/app/electron/main.js @@ -1109,7 +1109,7 @@ app.whenReady().then(() => { if (index === 0) { globalShortcut.register(shortcut, () => { let currentWorkspace; - const currentWebContentsId = (latestActiveWindow && !latestActiveWindow.isDestroyed()) ? latestActiveWindow.webContents.id : undefined + const currentWebContentsId = (latestActiveWindow && !latestActiveWindow.isDestroyed()) ? latestActiveWindow.webContents.id : undefined; workspaces.find(workspaceItem => { if ((currentWebContentsId || event.sender.id) === workspaceItem.browserWindow.webContents.id) { currentWorkspace = workspaceItem; diff --git a/app/src/asset/anno.ts b/app/src/asset/anno.ts index e64498cf6..f0c7ce977 100644 --- a/app/src/asset/anno.ts +++ b/app/src/asset/anno.ts @@ -393,21 +393,21 @@ const showToolbar = (element: HTMLElement, range: Range, target?: HTMLElement) = }; const getTextNode = (element: HTMLElement, isFirst: boolean) => { - const spans = element.querySelectorAll(".markedContent span") - let index = isFirst ? 0 : spans.length - 1 + const spans = element.querySelectorAll(".markedContent span"); + let index = isFirst ? 0 : spans.length - 1; while (spans[index]) { if (spans[index].textContent) { - break + break; } else { if (isFirst) { - index++ + index++; } else { - index-- + index--; } } } - return spans[index] -} + return spans[index]; +}; const getHightlightCoordsByRange = (pdf: any, color: string) => { const range = window.getSelection().getRangeAt(0); diff --git a/app/src/block/popover.ts b/app/src/block/popover.ts index 55599cf70..73d97abff 100644 --- a/app/src/block/popover.ts +++ b/app/src/block/popover.ts @@ -31,7 +31,7 @@ export const initBlockPopover = (app: App) => { if (aElement.classList.contains("av__cell")) { if (aElement.classList.contains("av__cell--header")) { const textElement = aElement.querySelector(".av__celltext"); - const desc = aElement.getAttribute("data-desc") + const desc = aElement.getAttribute("data-desc"); if (textElement.scrollWidth > textElement.clientWidth + 2 || desc) { if (desc) { tip = `${getCellText(aElement)}
${escapeAriaLabel(desc)}
`; @@ -56,7 +56,7 @@ export const initBlockPopover = (app: App) => { } } else if (aElement.parentElement.parentElement.classList.contains("av__views")) { const textElement = aElement.querySelector(".item__text"); - const desc = aElement.getAttribute("data-desc") + const desc = aElement.getAttribute("data-desc"); if (textElement.scrollWidth > textElement.clientWidth + 2 || desc) { if (desc) { tip = `${textElement.textContent}
${escapeAriaLabel(desc)}
`; diff --git a/app/src/boot/globalEvent/keydown.ts b/app/src/boot/globalEvent/keydown.ts index 78732583a..89a6404bc 100644 --- a/app/src/boot/globalEvent/keydown.ts +++ b/app/src/boot/globalEvent/keydown.ts @@ -510,7 +510,7 @@ const editKeydown = (app: App, event: KeyboardEvent) => { } else { const ids = Array.from(protyle.wysiwyg.element.querySelectorAll(".protyle-wysiwyg--select")).map(item => item.getAttribute("data-node-id")); if (ids.length === 0) { - ids.push(nodeElement.getAttribute("data-node-id")) + ids.push(nodeElement.getAttribute("data-node-id")); } copyTextByType(ids, "ref"); } diff --git a/app/src/history/history.ts b/app/src/history/history.ts index 2edde5efe..ff5836ee3 100644 --- a/app/src/history/history.ts +++ b/app/src/history/history.ts @@ -694,7 +694,7 @@ const bindEvent = (app: App, element: Element, dialog?: Dialog) => { assetElement.classList.remove("fn__none"); assetElement.innerHTML = renderAssetsPreview(dataPath); } else if (type === "doc") { - const k = (firstPanelElement.querySelector(".b3-text-field") as HTMLInputElement).value + const k = (firstPanelElement.querySelector(".b3-text-field") as HTMLInputElement).value; fetchPost("/api/history/getDocHistoryContent", { historyPath: dataPath, highlight: !isSupportCSSHL(), @@ -717,7 +717,7 @@ const bindEvent = (app: App, element: Element, dialog?: Dialog) => { } }); } - titleElement.classList.remove("fn__none") + titleElement.classList.remove("fn__none"); titleElement.textContent = target.querySelector(".b3-list-item__text").textContent; let currentItem = hasClosestByClassName(target, "b3-list") as HTMLElement; if (currentItem) { diff --git a/app/src/layout/dock/Backlink.ts b/app/src/layout/dock/Backlink.ts index 46edc0d5d..fdf28ea38 100644 --- a/app/src/layout/dock/Backlink.ts +++ b/app/src/layout/dock/Backlink.ts @@ -136,13 +136,13 @@ export class Backlink extends Model { item.addEventListener("blur", (event: KeyboardEvent) => { const inputElement = event.target as HTMLInputElement; inputElement.classList.add("fn__none"); - const filterIconElement = inputElement.nextElementSibling + const filterIconElement = inputElement.nextElementSibling; if (inputElement.value) { - filterIconElement.classList.add("block__icon--active") - filterIconElement.setAttribute("aria-label", window.siyuan.languages.filter + " " + inputElement.value) + filterIconElement.classList.add("block__icon--active"); + filterIconElement.setAttribute("aria-label", window.siyuan.languages.filter + " " + inputElement.value); } else { - filterIconElement.classList.remove("block__icon--active") - filterIconElement.setAttribute("aria-label", window.siyuan.languages.filter) + filterIconElement.classList.remove("block__icon--active"); + filterIconElement.setAttribute("aria-label", window.siyuan.languages.filter); } }); item.addEventListener("keydown", (event: KeyboardEvent) => { @@ -442,7 +442,7 @@ export class Backlink extends Model { }); svgElement.removeAttribute("disabled"); } else { - const keyword = isMention ? this.inputsElement[1].value : this.inputsElement[0].value + const keyword = isMention ? this.inputsElement[1].value : this.inputsElement[0].value; fetchPost(isMention ? "/api/ref/getBackmentionDoc" : "/api/ref/getBacklinkDoc", { defID: this.blockId, refTreeID: docId, diff --git a/app/src/protyle/header/Background.ts b/app/src/protyle/header/Background.ts index eaa5945f2..e5cba295b 100644 --- a/app/src/protyle/header/Background.ts +++ b/app/src/protyle/header/Background.ts @@ -542,7 +542,7 @@ export class Background { this.addTags(inputElement.value, protyle); } inputElement.value = ""; - inputElement.dispatchEvent(new CustomEvent("input")) + inputElement.dispatchEvent(new CustomEvent("input")); } else if (event.key === "Escape") { window.siyuan.menus.menu.remove(); } diff --git a/app/src/protyle/render/av/cell.ts b/app/src/protyle/render/av/cell.ts index c5040c7df..25fe7cd47 100644 --- a/app/src/protyle/render/av/cell.ts +++ b/app/src/protyle/render/av/cell.ts @@ -385,7 +385,7 @@ export const popTextCell = (protyle: IProtyle, cellElements: HTMLElement[], type if (cellRect.bottom > contentRect.bottom) { height = contentRect.bottom - cellRect.top; } - const width = Math.min(Math.max(cellRect.width, 25), contentRect.width) + const width = Math.min(Math.max(cellRect.width, 25), contentRect.width); style = `style="padding-top: 6.5px;position:absolute;left: ${(cellRect.left < contentRect.left || cellRect.left + width > contentRect.right) ? contentRect.left : cellRect.left}px;top: ${cellRect.top}px;width:${width}px;height: ${height}px"`; } else { style = `style="padding-top: 6.5px;position:absolute;left: ${cellRect.left}px;top: ${cellRect.top}px;width:${Math.max(cellRect.width, 25)}px;height: ${height}px"`; diff --git a/app/src/protyle/render/av/col.ts b/app/src/protyle/render/av/col.ts index 3fdd3e3e1..41362b210 100644 --- a/app/src/protyle/render/av/col.ts +++ b/app/src/protyle/render/av/col.ts @@ -120,7 +120,7 @@ export const getEditHTML = (options: { colData.options = []; } colData.options.forEach(item => { - const airaLabel = item.desc ? `${escapeAriaLabel(item.name)}
${escapeAriaLabel(item.desc || "")}
` : "" + const airaLabel = item.desc ? `${escapeAriaLabel(item.name)}
${escapeAriaLabel(item.desc || "")}
` : ""; html += `