diff --git a/app/src/layout/status.ts b/app/src/layout/status.ts index a57c22d09..b9aa62ad2 100644 --- a/app/src/layout/status.ts +++ b/app/src/layout/status.ts @@ -28,7 +28,7 @@ export const initStatus = (isWindow = false) => {
${menuHTML}
-` +`; } document.getElementById("status").innerHTML = `${barDockHTML}
diff --git a/app/src/layout/util.ts b/app/src/layout/util.ts index 798a5ac38..b53128c68 100644 --- a/app/src/layout/util.ts +++ b/app/src/layout/util.ts @@ -28,7 +28,6 @@ import {pdfResize} from "../asset/renderAssets"; import {Backlink} from "./dock/Backlink"; import {openFileById} from "../editor/util"; import {getSearch, isWindow} from "../util/functions"; -import {setTabPosition} from "../window/setHeader"; export const setPanelFocus = (element: Element) => { if (element.classList.contains("layout__tab--active") || element.classList.contains("layout__wnd--active")) { diff --git a/app/src/menus/tab.ts b/app/src/menus/tab.ts index d0dbedb01..3504f166d 100644 --- a/app/src/menus/tab.ts +++ b/app/src/menus/tab.ts @@ -223,9 +223,9 @@ export const initTabMenu = (tab: Tab) => { webSecurity: false, }, }); - const json = {} - layoutToJSON(tab, json) - win.loadURL(`${window.location.protocol}//${window.location.host}/stage/build/app/window.html?v=${Constants.SIYUAN_VERSION}&json=${JSON.stringify(json)}`) + const json = {}; + layoutToJSON(tab, json); + win.loadURL(`${window.location.protocol}//${window.location.host}/stage/build/app/window.html?v=${Constants.SIYUAN_VERSION}&json=${JSON.stringify(json)}`); tab.parent.removeTab(tab.id); } }).element); diff --git a/app/src/util/onGetConfig.ts b/app/src/util/onGetConfig.ts index 7d19e9c3b..b425acfd9 100644 --- a/app/src/util/onGetConfig.ts +++ b/app/src/util/onGetConfig.ts @@ -518,7 +518,7 @@ export const initWindow = () => { `; if (isWindow()) { - document.body.insertAdjacentHTML("beforeend", `
${controlsHTML}
`) + document.body.insertAdjacentHTML("beforeend", `
${controlsHTML}
`); } else { document.getElementById("windowControls").innerHTML = controlsHTML; } diff --git a/app/src/window/init.ts b/app/src/window/init.ts index 97c8b1f88..4a5851457 100644 --- a/app/src/window/init.ts +++ b/app/src/window/init.ts @@ -8,7 +8,6 @@ import {appearance} from "../config/appearance"; import {initAssets, setInlineStyle} from "../util/assets"; import {renderSnippet} from "../config/util/snippets"; import {getSearch} from "../util/functions"; -import {Layout} from "../layout"; import {initWindow} from "../util/onGetConfig"; export const init = () => { @@ -43,4 +42,4 @@ export const init = () => { resizeTabs(); }, 200); }); -} +}; diff --git a/app/src/window/setHeader.ts b/app/src/window/setHeader.ts index fea887d42..b1cf9dcc3 100644 --- a/app/src/window/setHeader.ts +++ b/app/src/window/setHeader.ts @@ -12,19 +12,19 @@ const getAllWnds = (layout: Layout, wnds: Wnd[]) => { getAllWnds(item, wnds); } } -} +}; export const setTabPosition = () => { if (!isWindow()) { return; } - const wndsTemp: Wnd[] = [] + const wndsTemp: Wnd[] = []; getAllWnds(window.siyuan.layout.layout, wndsTemp); wndsTemp.forEach(item => { const headerElement = item.headersElement.parentElement; - const rect = headerElement.getBoundingClientRect() - const dragElement = headerElement.querySelector('.item--readonly .fn__flex-1') as HTMLElement + const rect = headerElement.getBoundingClientRect(); + const dragElement = headerElement.querySelector(".item--readonly .fn__flex-1") as HTMLElement; if (rect.top <= 0) { - dragElement.style.height = dragElement.parentElement.clientHeight + "px" + dragElement.style.height = dragElement.parentElement.clientHeight + "px"; // @ts-ignore dragElement.style.WebkitAppRegion = "drag"; } else { @@ -44,5 +44,5 @@ export const setTabPosition = () => { (headerElement.lastElementChild as HTMLElement).style.paddingRight = ""; } } - }) -} + }); +};