diff --git a/app/src/editor/util.ts b/app/src/editor/util.ts index 9d337094e..c801b95d8 100644 --- a/app/src/editor/util.ts +++ b/app/src/editor/util.ts @@ -24,7 +24,7 @@ import {setTitle} from "../dialog/processSystem"; import {zoomOut} from "../menus/protyle"; import {countBlockWord, countSelectWord} from "../layout/status"; import {showMessage} from "../dialog/message"; -import {getSearch, objEquals} from "../util/functions"; +import {objEquals} from "../util/functions"; import {resize} from "../protyle/util/resize"; import {newCardModel} from "../card/newCardTab"; import {Search} from "../search"; @@ -160,16 +160,16 @@ export const openFile = (options: IOpenFileOptions) => { /// #if !BROWSER // https://github.com/siyuan-note/siyuan/issues/7491 - const currentWindowId = getCurrentWindow().id + const currentWindowId = getCurrentWindow().id; const hasMatch = BrowserWindow.getAllWindows().find(item => { if (item.id === currentWindowId) { return; } const ids = decodeURIComponent(new URL(item.webContents.getURL()).hash.substring(1)).split(Constants.ZWSP); if (ids.includes(options.rootID) || ids.includes(options.assetPath)) { - let execJS = `window.newWindow.switchTabById("${options.rootID || options.assetPath}");` + let execJS = `window.newWindow.switchTabById("${options.rootID || options.assetPath}");`; if (options.assetPath) { - execJS += `window.newWindow.positionPDF("${options.assetPath}", ${typeof options.page === "number" ? options.page : `"${options.page}"`})` + execJS += `window.newWindow.positionPDF("${options.assetPath}", ${typeof options.page === "number" ? options.page : `"${options.page}"`})`; } item.focus(); item.webContents.executeJavaScript(execJS); @@ -178,7 +178,7 @@ export const openFile = (options: IOpenFileOptions) => { } return true; } - }) + }); if (hasMatch) { return; } diff --git a/app/src/plugin/loader.ts b/app/src/plugin/loader.ts index e0cf202fc..412698fa8 100644 --- a/app/src/plugin/loader.ts +++ b/app/src/plugin/loader.ts @@ -28,7 +28,7 @@ export const loadPlugins = (app: App) => { console.error(`eval plugin ${item.name} error:`, e); return; } - const pluginClass = (moduleObj.exports || exportsObj).default || moduleObj.exports + const pluginClass = (moduleObj.exports || exportsObj).default || moduleObj.exports; if (typeof pluginClass !== "function") { console.error(`plugin ${item.name} has no export`); return; diff --git a/app/src/util/newFile.ts b/app/src/util/newFile.ts index e92b4c46a..c5280a757 100644 --- a/app/src/util/newFile.ts +++ b/app/src/util/newFile.ts @@ -11,7 +11,6 @@ import {getDisplayName, getOpenNotebookCount, pathPosix} from "./pathName"; import {Constants} from "../constants"; import {replaceFileName, validateName} from "../editor/rename"; import {hideElements} from "../protyle/ui/hideElements"; -import {isMobile} from "./functions"; import {openMobileFileById} from "../mobile/editor"; export const getNewFilePath = (useSavePath: boolean) => { diff --git a/app/src/window/global/function.ts b/app/src/window/global/function.ts index 79feec9f9..d0e700b42 100644 --- a/app/src/window/global/function.ts +++ b/app/src/window/global/function.ts @@ -25,13 +25,13 @@ export const switchTabById = (id: string) => { } else if (tab.model instanceof Editor) { if (tab.model.editor.protyle.block.rootID === id) { tab.parent.switchTab(tab.headElement); - return true + return true; } } else if (tab.model instanceof Asset) { if (tab.model.path === id) { tab.parent.switchTab(tab.headElement); - return true + return true; } } }); -} +}; diff --git a/app/src/window/setHeader.ts b/app/src/window/setHeader.ts index e29a5652b..d3ece6a43 100644 --- a/app/src/window/setHeader.ts +++ b/app/src/window/setHeader.ts @@ -58,21 +58,21 @@ export const setTabPosition = () => { export const setModelsHash = () => { if (!isWindow()) { - return + return; } - let hash = "" + let hash = ""; getAllTabs().forEach(tab => { if (!tab.model) { const initTab = tab.headElement.getAttribute("data-initdata"); if (initTab) { const initTabData = JSON.parse(initTab); - hash += initTabData.rootId + Constants.ZWSP + hash += initTabData.rootId + Constants.ZWSP; } } else if (tab.model instanceof Editor) { - hash += tab.model.editor.protyle.block.rootID + Constants.ZWSP + hash += tab.model.editor.protyle.block.rootID + Constants.ZWSP; } else if (tab.model instanceof Asset) { - hash += tab.model.path + Constants.ZWSP + hash += tab.model.path + Constants.ZWSP; } - }) - window.location.hash = hash -} + }); + window.location.hash = hash; +};