From ae1ff7ba39800d860c9cfbf15495f863b5169869 Mon Sep 17 00:00:00 2001 From: Vanessa Date: Tue, 10 Jan 2023 22:54:25 +0800 Subject: [PATCH] :rotating_light: --- app/src/dialog/processSystem.ts | 6 +----- app/src/layout/dock/Backlink.ts | 4 ++-- app/src/menus/workspace.ts | 9 ++++++--- app/src/protyle/wysiwyg/index.ts | 2 +- app/src/util/onGetConfig.ts | 5 ++--- 5 files changed, 12 insertions(+), 14 deletions(-) diff --git a/app/src/dialog/processSystem.ts b/app/src/dialog/processSystem.ts index 7f09e5155..9edab4f46 100644 --- a/app/src/dialog/processSystem.ts +++ b/app/src/dialog/processSystem.ts @@ -10,7 +10,7 @@ import {Dialog} from "./index"; import {isMobile} from "../util/functions"; import {confirmDialog} from "./confirmDialog"; import {getCurrentWindow} from "@electron/remote"; -import {originalPath} from "../util/pathName"; +import { getWorkspaceName } from "../menus/workspace"; export const lockFile = (id: string) => { const html = `
@@ -292,7 +292,3 @@ export const downloadProgress = (data: { id: string, percent: number }) => { } } }; - -export const getWorkspaceName = () => { - return window.siyuan.config.system.workspaceDir; -} diff --git a/app/src/layout/dock/Backlink.ts b/app/src/layout/dock/Backlink.ts index a71003680..e945ef6cc 100644 --- a/app/src/layout/dock/Backlink.ts +++ b/app/src/layout/dock/Backlink.ts @@ -253,7 +253,7 @@ export class Backlink extends Model { if (item.tagName === "LI" && !item.querySelector(".b3-list-item__arrow--open")) { this.toggleItem(item, false); } - }) + }); }); this.element.addEventListener("click", (event) => { this.setFocus(); @@ -270,7 +270,7 @@ export class Backlink extends Model { if (item.tagName === "LI" && !item.querySelector(".b3-list-item__arrow--open")) { this.toggleItem(item, true); } - }) + }); break; case "mCollapse": this.mTree.element.querySelectorAll(".protyle").forEach(item => { diff --git a/app/src/menus/workspace.ts b/app/src/menus/workspace.ts index c9f96b43c..8a3aa9345 100644 --- a/app/src/menus/workspace.ts +++ b/app/src/menus/workspace.ts @@ -98,7 +98,7 @@ export const workspaceMenu = (rect: DOMRect) => { if (item.closed) { return; } - workspaceItem(item) + workspaceItem(item); }); window.siyuan.menus.menu.append(new MenuItem({type: "separator"}).element); window.siyuan.menus.menu.append(new MenuItem({ @@ -107,7 +107,7 @@ export const workspaceMenu = (rect: DOMRect) => { type: "readonly" }).element); response.data.forEach((item: IWorkspace) => { - workspaceItem(item) + workspaceItem(item); }); /// #endif window.siyuan.menus.menu.popup({x: rect.left, y: rect.bottom}); @@ -160,4 +160,7 @@ const workspaceItem = (item: IWorkspace) => { }] }).element); /// #endif -} +}; +export const getWorkspaceName = () => { + return window.siyuan.config.system.workspaceDir; +}; diff --git a/app/src/protyle/wysiwyg/index.ts b/app/src/protyle/wysiwyg/index.ts index 99cc3bf36..92b76e884 100644 --- a/app/src/protyle/wysiwyg/index.ts +++ b/app/src/protyle/wysiwyg/index.ts @@ -1484,7 +1484,7 @@ export class WYSIWYG { openMobileFileById(refBlockId, foldResponse.data ? [Constants.CB_GET_ALL, Constants.CB_GET_HL] : [Constants.CB_GET_HL, Constants.CB_GET_CONTEXT]); /// #else if (aElement) { - window.open(aElement.getAttribute("data-href")) + window.open(aElement.getAttribute("data-href")); return; } if (window.siyuan.shiftIsPressed) { diff --git a/app/src/util/onGetConfig.ts b/app/src/util/onGetConfig.ts index 0c7223500..39c46a321 100644 --- a/app/src/util/onGetConfig.ts +++ b/app/src/util/onGetConfig.ts @@ -16,10 +16,9 @@ import {mountHelp} from "./mount"; import {MenuItem} from "../menus/Menu"; import {addGA, initAssets, setInlineStyle, setMode} from "./assets"; import {renderSnippet} from "../config/util/snippets"; -import {originalPath} from "./pathName"; import {openFileById} from "../editor/util"; import {focusByRange} from "../protyle/util/selection"; -import {exitSiYuan, getWorkspaceName} from "../dialog/processSystem"; +import {exitSiYuan} from "../dialog/processSystem"; import {openSetting} from "../config"; import {getSearch} from "./functions"; import {initStatus} from "../layout/status"; @@ -28,7 +27,7 @@ import {showMessage} from "../dialog/message"; import {editor} from "../config/editor"; import {goBack, goForward} from "./backForward"; import {replaceLocalPath} from "../editor/rename"; -import {workspaceMenu} from "../menus/workspace"; +import {getWorkspaceName, workspaceMenu} from "../menus/workspace"; const matchKeymap = (keymap: Record, key1: "general" | "editor", key2?: "general" | "insert" | "heading" | "list" | "table") => { if (key1 === "general") {