Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-12-26 19:38:48 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Vanessa 2024-01-26 17:58:16 +08:00
commit 8ce0d2487c
5 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/stage/protyle/js/lute/lute.min.js vendored
View file

File diff suppressed because one or more lines are too long

2
kernel/go.mod
View file

@ -9,7 +9,7 @@ require (
github.com/88250/clipboard v0.1.5
github.com/88250/epub v0.0.0-20230830085737-c19055cd1f48
github.com/88250/gulu v1.2.3-0.20231209020950-b7b6994e395c
github.com/88250/lute v1.7.6-0.20240125132009-df17802c9921
github.com/88250/lute v1.7.6-0.20240126032810-62fdba30a401
github.com/88250/pdfcpu v0.3.14-0.20230401044135-c7369a99720c
github.com/88250/vitess-sqlparser v0.0.0-20210205111146-56a2ded2aba1
github.com/ClarkThan/ahocorasick v0.0.0-20231011042242-30d1ef1347f4

4
kernel/go.sum
View file

@ -10,8 +10,8 @@ github.com/88250/go-sqlite3 v1.14.13-0.20231214121541-e7f54c482950 h1:Pa5hMiBceT
github.com/88250/go-sqlite3 v1.14.13-0.20231214121541-e7f54c482950/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU=
github.com/88250/gulu v1.2.3-0.20231209020950-b7b6994e395c h1:Fas3hxqP33xA9KKDV50jUmppiiOukk5bdV00Hk5VSSk=
github.com/88250/gulu v1.2.3-0.20231209020950-b7b6994e395c/go.mod h1:pTWnjt+6qUqNnP9xltswsJxgCBVu3C7eW09u48LWX0k=
github.com/88250/lute v1.7.6-0.20240125132009-df17802c9921 h1:tD18OxLTUa3by+BXKORWUiS2qx6RdMfIP0xRdG3+ZxY=
github.com/88250/lute v1.7.6-0.20240125132009-df17802c9921/go.mod h1:+wUqx/1kdFDbWtxn9LYJlaCOAeol2pjSO6w+WJTVQsg=
github.com/88250/lute v1.7.6-0.20240126032810-62fdba30a401 h1:fTb7QlH9cRR6TgizgWUlcQDvR8i9fMmo7kW7rOb8Pe0=
github.com/88250/lute v1.7.6-0.20240126032810-62fdba30a401/go.mod h1:+wUqx/1kdFDbWtxn9LYJlaCOAeol2pjSO6w+WJTVQsg=
github.com/88250/pdfcpu v0.3.14-0.20230401044135-c7369a99720c h1:Dl/8S9iLyPMTElnWIBxmjaLiWrkI5P4a21ivwAn5pU0=
github.com/88250/pdfcpu v0.3.14-0.20230401044135-c7369a99720c/go.mod h1:S5YT38L/GCjVjmB4PB84PymA1qfopjEhfhTNQilLpv4=
github.com/88250/vitess-sqlparser v0.0.0-20210205111146-56a2ded2aba1 h1:48T899JQDwyyRu9yXHePYlPdHtpJfrJEUGBMH3SMBWY=

3
kernel/treenode/tree.go
View file

@ -28,6 +28,7 @@ import (
"github.com/88250/gulu"
"github.com/88250/lute"
"github.com/88250/lute/ast"
"github.com/88250/lute/html"
"github.com/88250/lute/parse"
"github.com/siyuan-note/filelock"
"github.com/siyuan-note/siyuan/kernel/util"
@ -87,7 +88,7 @@ func IALStr(n *ast.Node) string {
if 1 > len(n.KramdownIAL) {
return ""
}
return string(parse.IAL2Tokens(n.KramdownIAL))
return html.UnescapeString(string(parse.IAL2Tokens(n.KramdownIAL)))
}
func RootChildIDs(rootID string) (ret []string) {

1
kernel/util/runtime.go
View file

@ -310,6 +310,7 @@ func isICloudPath(workspaceAbsPath string) (ret bool) {
if strings.HasPrefix(workspaceAbsPathLower, strings.ToLower(path)) {
ret = true
logging.LogWarnf("workspace [%s] is in iCloud path [%s]", workspaceAbsPath, path)
return io.EOF
}
return nil