Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: cherry_markdown error #908

Merged
merged 8 commits into from
Nov 20, 2023
Merged

fix: cherry_markdown error #908

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
f3e44e8
fix: first open document, cherryMarkdown not have theme
Jul 5, 2023
a6aa700
fix: modify prismjs style and improve image clarity
jh244212647 Aug 15, 2023
3695521
update cherry-markdown
Aug 15, 2023
342d84d
optimiztion: cherry-markdown
Aug 15, 2023
56c7803
feat: cherry-markdown add auto-save and update icon
Aug 16, 2023
93b3638
Merge branch 'mindoc-org:master' into master
jh244212647 Aug 19, 2023
b5f52c5
Merge branch 'mindoc-org:master' into master
jh244212647 Nov 19, 2023
0821150
fix: the mobile phone displays abnormally and Markdown does not allow…
Nov 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v3
with:
go-version: 1.18
go-version: 1.20.0

- name: Build
run: |
Expand Down
3 changes: 2 additions & 1 deletion conf/lang/en-us.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,6 +224,7 @@ project_label_desc = Allows up to 10 labels, use ";" to separate multiple tags
cannot_change_own_status = Cannot change own status
cannot_change_super_status = Cannot change super administrator status
cannot_change_super_priv = Cannot change super administrator permissions
editors_not_compatible = two editors are not compatible

[blog]
author = Author
Expand Down Expand Up @@ -571,4 +572,4 @@ create_time = Create Time
creator = Creator
doc_amount = Number of Document
last_edit = Last Edit
delete_project = Delete Project
delete_project = Delete Project
1 change: 1 addition & 0 deletions conf/lang/zh-cn.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,6 +224,7 @@ project_label_desc = 最多允许添加10个标签，多个标签请用“;”
cannot_change_own_status = 不能变更自己的状态
cannot_change_super_status = 不能变更超级管理员的状态
cannot_change_super_priv = 不能变更超级管理员的权限
editors_not_compatible = 两种编辑器不兼容

[blog]
author = 作者
Expand Down
3 changes: 3 additions & 0 deletions controllers/BookController.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,9 @@ func (c *BookController) SaveBook() {
book.CommentStatus = commentStatus
book.Publisher = publisher
//book.Label = tag
if book.Editor == EditorMarkdown && editor == EditorCherryMarkdown || book.Editor == EditorCherryMarkdown && editor == EditorMarkdown {
c.JsonResult(6006, i18n.Tr(c.Lang, "message.editors_not_compatible"))
}
book.Editor = editor
if editor == EditorCherryMarkdown {
book.Theme = "cherry"
Expand Down
15 changes: 11 additions & 4 deletions static/css/markdown.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -548,12 +548,13 @@ iframe.cherry-dialog-iframe {
margin-right: 50px;
}

.markdown-article-body {
margin-right: 200px !important;
@media screen and (min-width: 840px) {
.markdown-article {
margin-right: 200px !important;
}
}

.markdown-article-head {
margin-right: 200px !important;
width: unset !important;
padding: unset !important;
padding-top: 10px !important;
Expand All @@ -562,4 +563,10 @@ iframe.cherry-dialog-iframe {
.markdown-title {
padding: unset !important;
width: 100% !important;
}
}

@media screen and (max-width: 839px) {
.toc {
display: none !important;
}
}
6 changes: 4 additions & 2 deletions utils/html.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ func StripTags(s string) string {
return src
}

//自动提取文章摘要
// 自动提取文章摘要
func AutoSummary(body string, l int) string {

//匹配图片，如果图片语法是在代码块中，这里同样会处理
Expand All @@ -60,7 +60,7 @@ func AutoSummary(body string, l int) string {
return content
}

//安全处理HTML文档，过滤危险标签和属性.
// 安全处理HTML文档，过滤危险标签和属性.
func SafetyProcessor(html string) string {

//安全过滤，移除危险标签和属性
Expand Down Expand Up @@ -117,6 +117,8 @@ func SafetyProcessor(html string) string {
if selector := docQuery.Find("div.markdown-article").First(); selector.Size() <= 0 {
if selector := docQuery.Find("div.markdown-toc").First(); selector.Size() > 0 {
docQuery.Find("div.markdown-toc").NextAll().WrapAllHtml("<div class=\"markdown-article\"></div>")
} else if selector := docQuery.Find("dir.toc").First(); selector.Size() > 0 {
docQuery.Find("dir.toc").NextAll().WrapAllHtml("<div class=\"markdown-article\"></div>")
}
}

Expand Down