Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2026-01-02 06:48:49 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

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

Browse source
This commit is contained in:
Vanessa 2023-04-14 16:44:56 +08:00
commit c2ca60c649
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/src/protyle/toolbar/index.ts
View file

@ -1105,8 +1105,8 @@ export class Toolbar {
if (!html.endsWith("\n</div>")) {
html = `${html}\n</div>`;
}
// 需移除换行 https://github.com/siyuan-note/siyuan/issues/7921
html = html.replace(/\n\n/g, "\n");
// 需移除连续的换行 (空行) https://github.com/siyuan-note/siyuan/issues/7921
html = html.replace(/\n+/g, "\n");
}
renderElement.querySelector("protyle-html").setAttribute("data-content", Lute.EscapeHTMLStr(html));
} else if (isInlineMemo) {

4
kernel/model/file.go
View file

@ -147,7 +147,7 @@ func SearchDocsByKeyword(keyword string, flashcard bool) (ret []map[string]strin
var deckBlockIDs []string
if flashcard {
deck := Decks[builtinDeckID]
if nil != deck {
if nil == deck {
return
}
deckBlockIDs = deck.GetBlockIDs()
@ -232,7 +232,7 @@ func ListDocTree(boxID, path string, sortMode int, flashcard bool, maxListCount
var deckBlockIDs []string
if flashcard {
deck := Decks[builtinDeckID]
if nil != deck {
if nil == deck {
return
}
deckBlockIDs = deck.GetBlockIDs()