Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-12-16 22:50:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

🚨

Browse source
This commit is contained in:
Vanessa 2022-06-23 01:19:04 +08:00
parent 62cbcf63e5
commit 25ddad5957
9 changed files with 14 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/src/asset/anno.ts
View file

@ -384,12 +384,12 @@ const getHightlightCoordsByRange = (pdf: any, color: string) => {
} }
const endIndex = parseInt(endPageElement.getAttribute("data-page-number")) - 1; const endIndex = parseInt(endPageElement.getAttribute("data-page-number")) - 1;
// https://github.com/siyuan-note/siyuan/issues/5213 // https://github.com/siyuan-note/siyuan/issues/5213
const rangeContents = range.cloneContents() const rangeContents = range.cloneContents();
Array.from(rangeContents.children).forEach(item => { Array.from(rangeContents.children).forEach(item => {
if (item.tagName === "BR") { if (item.tagName === "BR") {
const previousText = item.previousElementSibling.textContent const previousText = item.previousElementSibling.textContent;
if (previousText.endsWith("-")) { if (previousText.endsWith("-")) {
item.previousElementSibling.textContent = previousText.substring(0, previousText.length - 1) item.previousElementSibling.textContent = previousText.substring(0, previousText.length - 1);
} else { } else {
item.insertAdjacentText("afterend", " "); item.insertAdjacentText("afterend", " ");
} }

2
app/src/editor/util.ts
View file

@ -563,4 +563,4 @@ export const deleteFile = (notebookId: string, pathString: string, name: string)
}); });
}); });
}); });
} };

10
app/src/layout/Wnd.ts
View file

@ -427,17 +427,17 @@ export class Wnd {
this.removeTab(this.children[0].id); this.removeTab(this.children[0].id);
} else if (this.children.length > 5) { // TODO: 需从后台设置中获取 } else if (this.children.length > 5) { // TODO: 需从后台设置中获取
let removeId: string; let removeId: string;
let openTime: string let openTime: string;
this.children.forEach((item, index) => { this.children.forEach((item, index) => {
if (item.headElement.classList.contains("item--pin") || item.headElement.classList.contains("item--focus") || index === oldFocusIndex) { if (item.headElement.classList.contains("item--pin") || item.headElement.classList.contains("item--focus") || index === oldFocusIndex) {
return; return;
} }
if (!openTime) { if (!openTime) {
openTime = item.headElement.getAttribute("data-opentime") openTime = item.headElement.getAttribute("data-opentime");
removeId = this.children[index].id removeId = this.children[index].id;
} else if (item.headElement.getAttribute("data-opentime") < openTime) { } else if (item.headElement.getAttribute("data-opentime") < openTime) {
openTime = item.headElement.getAttribute("data-opentime") openTime = item.headElement.getAttribute("data-opentime");
removeId = this.children[index].id removeId = this.children[index].id;
} }
}); });
if (removeId) { if (removeId) {

2
app/src/menus/commonMenuItem.ts
View file

@ -5,7 +5,7 @@ import {newFile} from "../util/newFile";
import {getDockByType} from "../layout/util"; import {getDockByType} from "../layout/util";
import {confirmDialog} from "../dialog/confirmDialog"; import {confirmDialog} from "../dialog/confirmDialog";
import {getSearch, isMobile} from "../util/functions"; import {getSearch, isMobile} from "../util/functions";
import {getDisplayName, isLocalPath, movePathTo} from "../util/pathName"; import {isLocalPath, movePathTo} from "../util/pathName";
import {MenuItem} from "./Menu"; import {MenuItem} from "./Menu";
import {hasClosestByClassName} from "../protyle/util/hasClosest"; import {hasClosestByClassName} from "../protyle/util/hasClosest";
import {saveExport} from "../protyle/export"; import {saveExport} from "../protyle/export";

2
app/src/menus/protyle.ts
View file

@ -303,7 +303,7 @@ export const contentMenu = (protyle: IProtyle, nodeElement: Element) => {
// * _ [ ] ! \ ` < > & ~ { } ( ) = # $ ^ | // * _ [ ] ! \ ` < > & ~ { } ( ) = # $ ^ |
let clipText = await navigator.clipboard.readText(); let clipText = await navigator.clipboard.readText();
clipText = clipText.replace(/\*/g, "\\*").replace(/\_/g, "\\_").replace(/\[/g, "\\[").replace(/\]/g, "\\]").replace(/\!/g, "\\!").replace(/\\/g, "\\").replace(/\`/g, "\\`").replace(/\</g, "\\<").replace(/\>/g, "\\>"). clipText = clipText.replace(/\*/g, "\\*").replace(/\_/g, "\\_").replace(/\[/g, "\\[").replace(/\]/g, "\\]").replace(/\!/g, "\\!").replace(/\\/g, "\\").replace(/\`/g, "\\`").replace(/\</g, "\\<").replace(/\>/g, "\\>").
replace(/\&/g, "\\&").replace(/\~/g, "\\~").replace(/\{/g, "\\{").replace(/\}/g, "\\}").replace(/\(/g, "\\(").replace(/\)/g, "\\)").replace(/\=/g, "\\=").replace(/\#/g, "\\#").replace(/\$/g, "\\$").replace(/\^/g, "\\^").replace(/\|/g, "\\|") replace(/\&/g, "\\&").replace(/\~/g, "\\~").replace(/\{/g, "\\{").replace(/\}/g, "\\}").replace(/\(/g, "\\(").replace(/\)/g, "\\)").replace(/\=/g, "\\=").replace(/\#/g, "\\#").replace(/\$/g, "\\$").replace(/\^/g, "\\^").replace(/\|/g, "\\|");
pasteText(protyle, clipText, nodeElement); pasteText(protyle, clipText, nodeElement);
} catch (e) { } catch (e) {
console.log(e); console.log(e);

2
app/src/protyle/header/Title.ts
View file

@ -261,7 +261,7 @@ export class Title {
icon: "iconTrashcan", icon: "iconTrashcan",
label: window.siyuan.languages.delete, label: window.siyuan.languages.delete,
click: () => { click: () => {
deleteFile(protyle.notebookId, protyle.path, escapeHtml(this.editElement.textContent)) deleteFile(protyle.notebookId, protyle.path, escapeHtml(this.editElement.textContent));
} }
}).element); }).element);
} }

1
app/src/protyle/util/hotKey.ts
View file

@ -1,5 +1,4 @@
import {isCtrl} from "./compatibility"; import {isCtrl} from "./compatibility";
import {Constants} from "../../constants";
// 是否匹配 ⇧⌘[] / ⌘[] / ⌥[] / ⌥⌘[] / ⇧Tab / [] // 是否匹配 ⇧⌘[] / ⌘[] / ⌥[] / ⌥⌘[] / ⇧Tab / []
export const matchHotKey = (hotKey: string, event: KeyboardEvent) => { export const matchHotKey = (hotKey: string, event: KeyboardEvent) => {

2
app/src/protyle/wysiwyg/index.ts
View file

@ -1468,7 +1468,7 @@ export class WYSIWYG {
const embedItemElement = hasClosestByClassName(event.target, "protyle-wysiwyg__embed"); const embedItemElement = hasClosestByClassName(event.target, "protyle-wysiwyg__embed");
if (embedItemElement) { if (embedItemElement) {
const embedId = embedItemElement.getAttribute("data-id") const embedId = embedItemElement.getAttribute("data-id");
if (isMobile()) { if (isMobile()) {
openMobileFileById(embedId, false, [Constants.CB_GET_ALL]); openMobileFileById(embedId, false, [Constants.CB_GET_ALL]);
} else if (window.siyuan.shiftIsPressed) { } else if (window.siyuan.shiftIsPressed) {

2
app/src/util/onGetConfig.ts
View file

@ -271,7 +271,7 @@ const initBar = () => {
}); });
resizeTabs(); resizeTabs();
}); });
document.getElementById("toolbarVIP").addEventListener("click", (event) => { document.getElementById("toolbarVIP").addEventListener("click", () => {
const dialogSetting = openSetting(); const dialogSetting = openSetting();
dialogSetting.element.querySelector('.b3-tab-bar [data-name="account"]').dispatchEvent(new CustomEvent("click")); dialogSetting.element.querySelector('.b3-tab-bar [data-name="account"]').dispatchEvent(new CustomEvent("click"));
}); });