Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wiki-js
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
1
Issues
1
List
Board
Labels
Milestones
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
wiki-js
Commits
e03a80dc
Unverified
Commit
e03a80dc
authored
Jun 19, 2020
by
Regev Brody
Committed by
GitHub
Jun 18, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat: underline markdown support (#2073)
* fix: no markdown support for underline #2072
parent
0e6340f5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
39 additions
and
1 deletion
+39
-1
editor-markdown.vue
client/components/editor/editor-markdown.vue
+2
-0
index.js
client/libs/markdown-it-underline/index.js
+12
-0
definition.yml
server/modules/rendering/markdown-core/definition.yml
+8
-1
renderer.js
server/modules/rendering/markdown-core/renderer.js
+5
-0
underline.js
server/modules/rendering/markdown-core/underline.js
+12
-0
No files found.
client/components/editor/editor-markdown.vue
View file @
e03a80dc
...
@@ -220,6 +220,7 @@ import mdMark from 'markdown-it-mark'
...
@@ -220,6 +220,7 @@ import mdMark from 'markdown-it-mark'
import
mdFootnote
from
'markdown-it-footnote'
import
mdFootnote
from
'markdown-it-footnote'
import
mdImsize
from
'markdown-it-imsize'
import
mdImsize
from
'markdown-it-imsize'
import
katex
from
'katex'
import
katex
from
'katex'
import
underline
from
'../../libs/markdown-it-underline'
import
'katex/dist/contrib/mhchem'
import
'katex/dist/contrib/mhchem'
import
twemoji
from
'twemoji'
import
twemoji
from
'twemoji'
import
plantuml
from
'./markdown/plantuml'
import
plantuml
from
'./markdown/plantuml'
...
@@ -268,6 +269,7 @@ const md = new MarkdownIt({
...
@@ -268,6 +269,7 @@ const md = new MarkdownIt({
.
use
(
mdAttrs
,
{
.
use
(
mdAttrs
,
{
allowedAttributes
:
[
'id'
,
'class'
,
'target'
]
allowedAttributes
:
[
'id'
,
'class'
,
'target'
]
}
)
}
)
.
use
(
underline
)
.
use
(
mdEmoji
)
.
use
(
mdEmoji
)
.
use
(
mdTaskLists
,
{
label
:
true
,
labelAfter
:
true
}
)
.
use
(
mdTaskLists
,
{
label
:
true
,
labelAfter
:
true
}
)
.
use
(
mdExpandTabs
)
.
use
(
mdExpandTabs
)
...
...
client/libs/markdown-it-underline/index.js
0 → 100644
View file @
e03a80dc
const
renderEm
=
(
tokens
,
idx
,
opts
,
env
,
slf
)
=>
{
const
token
=
tokens
[
idx
];
if
(
token
.
markup
===
'_'
)
{
token
.
tag
=
'u'
;
}
return
slf
.
renderToken
(
tokens
,
idx
,
opts
);
}
module
.
exports
=
(
md
)
=>
{
md
.
renderer
.
rules
.
em_open
=
renderEm
;
md
.
renderer
.
rules
.
em_close
=
renderEm
;
}
server/modules/rendering/markdown-core/definition.yml
View file @
e03a80dc
...
@@ -34,12 +34,19 @@ props:
...
@@ -34,12 +34,19 @@ props:
hint
:
Enable some language-neutral replacement + quotes beautification
hint
:
Enable some language-neutral replacement + quotes beautification
order
:
4
order
:
4
public
:
true
public
:
true
underline
:
type
:
Boolean
default
:
false
title
:
Underline Support
hint
:
Enable underline by using _underline_
order
:
5
public
:
true
quotes
:
quotes
:
type
:
String
type
:
String
default
:
English
default
:
English
title
:
Quotes style
title
:
Quotes style
hint
:
When typographer is enabled. Double + single quotes replacement pairs. e.g. «»„“ for Russian, „“‚‘ for German, etc.
hint
:
When typographer is enabled. Double + single quotes replacement pairs. e.g. «»„“ for Russian, „“‚‘ for German, etc.
order
:
5
order
:
6
enum
:
enum
:
-
Chinese
-
Chinese
-
English
-
English
...
...
server/modules/rendering/markdown-core/renderer.js
View file @
e03a80dc
const
md
=
require
(
'markdown-it'
)
const
md
=
require
(
'markdown-it'
)
const
mdAttrs
=
require
(
'markdown-it-attrs'
)
const
mdAttrs
=
require
(
'markdown-it-attrs'
)
const
_
=
require
(
'lodash'
)
const
_
=
require
(
'lodash'
)
const
underline
=
require
(
'./underline'
)
const
quoteStyles
=
{
const
quoteStyles
=
{
Chinese
:
'””‘’'
,
Chinese
:
'””‘’'
,
...
@@ -30,6 +31,10 @@ module.exports = {
...
@@ -30,6 +31,10 @@ module.exports = {
}
}
})
})
if
(
this
.
config
.
underline
)
{
mkdown
.
use
(
underline
)
}
mkdown
.
use
(
mdAttrs
,
{
mkdown
.
use
(
mdAttrs
,
{
allowedAttributes
:
[
'id'
,
'class'
,
'target'
]
allowedAttributes
:
[
'id'
,
'class'
,
'target'
]
})
})
...
...
server/modules/rendering/markdown-core/underline.js
0 → 100644
View file @
e03a80dc
const
renderEm
=
(
tokens
,
idx
,
opts
,
env
,
slf
)
=>
{
const
token
=
tokens
[
idx
];
if
(
token
.
markup
===
'_'
)
{
token
.
tag
=
'u'
;
}
return
slf
.
renderToken
(
tokens
,
idx
,
opts
);
}
module
.
exports
=
(
md
)
=>
{
md
.
renderer
.
rules
.
em_open
=
renderEm
;
md
.
renderer
.
rules
.
em_close
=
renderEm
;
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment