diff --git a/app/src/boot/onGetConfig.ts b/app/src/boot/onGetConfig.ts index 53c6a31ab..0721aa883 100644 --- a/app/src/boot/onGetConfig.ts +++ b/app/src/boot/onGetConfig.ts @@ -26,7 +26,6 @@ import {initBar} from "../layout/topBar"; import {setProxy} from "../config/util/setProxy"; import {openChangelog} from "./openChangelog"; import {getIdFromSYProtocol, isSYProtocol} from "../util/pathName"; -import {App} from "../index"; const matchKeymap = (keymap: Record, key1: "general" | "editor", key2?: "general" | "insert" | "heading" | "list" | "table") => { if (key1 === "general") { @@ -85,7 +84,7 @@ const hasKeymap = (keymap: Record, key1: "general" | "edito return match; }; -export const onGetConfig = (isStart: boolean, app:App) => { +export const onGetConfig = (isStart: boolean) => { const matchKeymap1 = matchKeymap(Constants.SIYUAN_KEYMAP.general, "general"); const matchKeymap2 = matchKeymap(Constants.SIYUAN_KEYMAP.editor.general, "editor", "general"); const matchKeymap3 = matchKeymap(Constants.SIYUAN_KEYMAP.editor.insert, "editor", "insert"); @@ -141,7 +140,7 @@ export const onGetConfig = (isStart: boolean, app:App) => { resetLayout(); } }); - initBar(app); + initBar(); setProxy(); initStatus(); initWindow(); diff --git a/app/src/index.ts b/app/src/index.ts index 1f928ffa5..5c1d1d9ae 100644 --- a/app/src/index.ts +++ b/app/src/index.ts @@ -171,7 +171,7 @@ export class App { fetchPost("/api/setting/getCloudUser", {}, userResponse => { window.siyuan.user = userResponse.data; loadPlugins(siyuanApp); - onGetConfig(response.data.start, siyuanApp); + onGetConfig(response.data.start); account.onSetaccount(); resizeDrag(); setTitle(window.siyuan.languages.siyuanNote); diff --git a/app/src/layout/topBar.ts b/app/src/layout/topBar.ts index fbdba6da0..e81301e60 100644 --- a/app/src/layout/topBar.ts +++ b/app/src/layout/topBar.ts @@ -9,7 +9,6 @@ import {MenuItem} from "../menus/Menu"; import {setMode} from "../util/assets"; import {openSetting} from "../config"; import {openSearch} from "../search/spread"; -import {App} from "../index"; export const updateEditModeElement = () => { const target = document.querySelector("#barReadonly"); @@ -24,7 +23,7 @@ export const updateEditModeElement = () => { } }; -export const initBar = (app: App) => { +export const initBar = () => { const toolbarElement = document.getElementById("toolbar"); toolbarElement.innerHTML = `