0ct0pu5/siyuan
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/dev' into dev

Browse source
This commit is contained in:
Vanessa 2023-01-05 22:50:14 +08:00
commit c086426a75
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/src/dialog/processSystem.ts
View file

@ -10,7 +10,7 @@ import {Dialog} from "./index";
import {isMobile} from "../util/functions";
import {confirmDialog} from "./confirmDialog";
import {getCurrentWindow} from "@electron/remote";
import {pathPosix} from "../util/pathName";
import {originalPath} from "../util/pathName";
export const lockFile = (id: string) => {
const html = `<div class="b3-dialog__scrim"></div>
@ -263,15 +263,15 @@ export const bootSync = () => {
export const setTitle = (title: string) => {
const dragElement = document.getElementById("drag");
const workspaceName = pathPosix().basename(window.siyuan.config.system.workspaceDir)
const workspaceName = originalPath().basename(window.siyuan.config.system.workspaceDir)
if (title === window.siyuan.languages.siyuanNote) {
const versionTitle =`${workspaceName} - ${title} v${Constants.SIYUAN_VERSION}`;
const versionTitle = `${title} - ${workspaceName} - v${Constants.SIYUAN_VERSION}`;
document.title = versionTitle;
dragElement.textContent = versionTitle;
dragElement.setAttribute("title", versionTitle);
} else {
title = title || "Untitled";
document.title =`${workspaceName} - ${title} - ${window.siyuan.languages.siyuanNote} v${Constants.SIYUAN_VERSION}`;
document.title = `${title} - ${workspaceName} - ${window.siyuan.languages.siyuanNote} v${Constants.SIYUAN_VERSION}`;
dragElement.textContent = title;
dragElement.setAttribute("title", title);
}

4
app/src/util/pathName.ts
View file

@ -59,6 +59,10 @@ export const pathPosix = () => {
return path;
};
export const originalPath = () => {
return path;
};
export const getTopPaths = (liElements: Element[]) => {
const fromPaths: string[] = [];
liElements.forEach((item: HTMLElement) => {