diff --git a/app/src/config/bazaar.ts b/app/src/config/bazaar.ts index b99859700..15c4cdbc1 100644 --- a/app/src/config/bazaar.ts +++ b/app/src/config/bazaar.ts @@ -1,7 +1,6 @@ import {appearance} from "./appearance"; import {showMessage} from "../dialog/message"; import {fetchPost} from "../util/fetch"; -import {hasClosestByClassName} from "../protyle/util/hasClosest"; import {confirmDialog} from "../dialog/confirmDialog"; import {highlightRender} from "../protyle/markdown/highlightRender"; import {exportLayout} from "../layout/util"; @@ -151,7 +150,7 @@ export const bazaar = { repoURL: item.repoURL, repoHash: item.repoHash, downloaded: false, - } + }; return `
@@ -202,7 +201,7 @@ export const bazaar = { repoURL: item.repoURL, repoHash: item.repoHash, downloaded: true - } + }; html += `
@@ -270,7 +269,7 @@ export const bazaar = { repoURL: data.repoURL, repoHash: data.repoHash, downloaded: true - } + }; readmeElement.innerHTML = `
@@ -415,7 +414,7 @@ export const bazaar = { } else if (type === "install-t") { if (!target.classList.contains("b3-button--progress")) { confirmDialog(window.siyuan.languages.update, window.siyuan.languages.exportTplTip, () => { - const dataObj = JSON.parse(target.parentElement.parentElement.getAttribute("data-obj")) + const dataObj = JSON.parse(target.parentElement.parentElement.getAttribute("data-obj")); const bazaarType: TBazaarType = dataObj.bazaarType; let url = "/api/bazaar/installBazaarTemplate"; if (bazaarType === "themes") { @@ -457,7 +456,7 @@ export const bazaar = { event.stopPropagation(); break; } else if (type === "uninstall") { - const dataObj = JSON.parse(target.parentElement.parentElement.getAttribute("data-obj")) + const dataObj = JSON.parse(target.parentElement.parentElement.getAttribute("data-obj")); const bazaarType: TBazaarType = dataObj.bazaarType; let url = "/api/bazaar/uninstallBazaarTemplate"; if (bazaarType === "themes") { @@ -485,7 +484,7 @@ export const bazaar = { event.stopPropagation(); break; } else if (type === "switch") { - const dataObj = JSON.parse(target.parentElement.parentElement.getAttribute("data-obj")) + const dataObj = JSON.parse(target.parentElement.parentElement.getAttribute("data-obj")); const bazaarType: TBazaarType = dataObj.bazaarType; const packageName = dataObj.name; const mode = dataObj.themeMode === "dark" ? 1 : 0; @@ -495,7 +494,7 @@ export const bazaar = { }), (appearanceResponse) => { this._genMyHTML(bazaarType); fetchPost("/api/bazaar/getBazaarIcon", {}, response => { - response.data.appearance = appearanceResponse.data + response.data.appearance = appearanceResponse.data; bazaar._onBazaar(response, "icons", true); bazaar._data.icons = response.data.packages; }); @@ -515,7 +514,7 @@ export const bazaar = { } else { this._genMyHTML("themes"); fetchPost("/api/bazaar/getBazaarTheme", {}, response => { - response.data.appearance = appearanceResponse.data + response.data.appearance = appearanceResponse.data; bazaar._onBazaar(response, "themes", true); bazaar._data.themes = response.data.packages; }); diff --git a/app/src/layout/util.ts b/app/src/layout/util.ts index 636107cb2..9e8244932 100644 --- a/app/src/layout/util.ts +++ b/app/src/layout/util.ts @@ -488,7 +488,7 @@ export const resizeTabs = () => { if (!item.element.classList.contains("fn__none") && item.editor.protyle.toolbar.range) { let rangeRect = item.editor.protyle.toolbar.range.getBoundingClientRect(); if (rangeRect.height === 0) { - const blockElement = hasClosestBlock(item.editor.protyle.toolbar.range.startContainer) + const blockElement = hasClosestBlock(item.editor.protyle.toolbar.range.startContainer); if (blockElement) { rangeRect = blockElement.getBoundingClientRect(); } @@ -613,17 +613,17 @@ export const addResize = (obj: Layout | Wnd) => { const getMinSize = (element: HTMLElement) => { let minSize = 220; - Array.from(element.querySelectorAll('.file-tree')).find((item) => { + Array.from(element.querySelectorAll(".file-tree")).find((item) => { if (item.classList.contains("sy__backlink") || item.classList.contains("sy__graph") || item.classList.contains("sy__globalGraph") || item.classList.contains("sy__inbox")) { if (!item.classList.contains("fn__none") && !hasClosestByClassName(item, "fn__none")) { - minSize = 320 + minSize = 320; return true; } } - }) - return minSize - } + }); + return minSize; + }; const resizeWnd = (resizeElement: HTMLElement, direction: string) => { const setSize = (item: HTMLElement, direction: string) => { if (item.classList.contains("fn__flex-1")) {