diff options
author | Chocobozzz <me@florianbigard.com> | 2018-02-23 10:05:17 +0100 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2018-02-23 10:05:17 +0100 |
commit | 621d99f53f47a11919ec243e05273ecf5907b444 (patch) | |
tree | dcd0d0ccc21bad4065bf49e2df3e641ffa18fee1 /client/src/app/videos/shared | |
parent | 8a8e02a43e346b9b777c8192a7c5cbdccb928b11 (diff) | |
download | PeerTube-621d99f53f47a11919ec243e05273ecf5907b444.tar.gz PeerTube-621d99f53f47a11919ec243e05273ecf5907b444.tar.zst PeerTube-621d99f53f47a11919ec243e05273ecf5907b444.zip |
Better help on markdown fields
Diffstat (limited to 'client/src/app/videos/shared')
-rw-r--r-- | client/src/app/videos/shared/markdown.service.ts | 42 |
1 files changed, 24 insertions, 18 deletions
diff --git a/client/src/app/videos/shared/markdown.service.ts b/client/src/app/videos/shared/markdown.service.ts index fdd0ec8d2..9d73efa46 100644 --- a/client/src/app/videos/shared/markdown.service.ts +++ b/client/src/app/videos/shared/markdown.service.ts | |||
@@ -4,28 +4,22 @@ import * as MarkdownIt from 'markdown-it' | |||
4 | 4 | ||
5 | @Injectable() | 5 | @Injectable() |
6 | export class MarkdownService { | 6 | export class MarkdownService { |
7 | static TEXT_RULES = [ | ||
8 | 'linkify', | ||
9 | 'autolink', | ||
10 | 'emphasis', | ||
11 | 'link', | ||
12 | 'newline', | ||
13 | 'list' | ||
14 | ] | ||
15 | static ENHANCED_RULES = MarkdownService.TEXT_RULES.concat([ 'image' ]) | ||
16 | |||
7 | private textMarkdownIt: MarkdownIt.MarkdownIt | 17 | private textMarkdownIt: MarkdownIt.MarkdownIt |
8 | private enhancedMarkdownIt: MarkdownIt.MarkdownIt | 18 | private enhancedMarkdownIt: MarkdownIt.MarkdownIt |
9 | 19 | ||
10 | constructor () { | 20 | constructor () { |
11 | this.textMarkdownIt = new MarkdownIt('zero', { linkify: true, breaks: true }) | 21 | this.textMarkdownIt = this.createMarkdownIt(MarkdownService.TEXT_RULES) |
12 | .enable('linkify') | 22 | this.enhancedMarkdownIt = this.createMarkdownIt(MarkdownService.ENHANCED_RULES) |
13 | .enable('autolink') | ||
14 | .enable('emphasis') | ||
15 | .enable('link') | ||
16 | .enable('newline') | ||
17 | .enable('list') | ||
18 | this.setTargetToLinks(this.textMarkdownIt) | ||
19 | |||
20 | this.enhancedMarkdownIt = new MarkdownIt('zero', { linkify: true, breaks: true }) | ||
21 | .enable('linkify') | ||
22 | .enable('autolink') | ||
23 | .enable('emphasis') | ||
24 | .enable('link') | ||
25 | .enable('newline') | ||
26 | .enable('list') | ||
27 | .enable('image') | ||
28 | this.setTargetToLinks(this.enhancedMarkdownIt) | ||
29 | } | 23 | } |
30 | 24 | ||
31 | textMarkdownToHTML (markdown: string) { | 25 | textMarkdownToHTML (markdown: string) { |
@@ -40,6 +34,18 @@ export class MarkdownService { | |||
40 | return this.avoidTruncatedLinks(html) | 34 | return this.avoidTruncatedLinks(html) |
41 | } | 35 | } |
42 | 36 | ||
37 | private createMarkdownIt (rules: string[]) { | ||
38 | const markdownIt = new MarkdownIt('zero', { linkify: true, breaks: true }) | ||
39 | |||
40 | for (let rule of rules) { | ||
41 | markdownIt.enable(rule) | ||
42 | } | ||
43 | |||
44 | this.setTargetToLinks(markdownIt) | ||
45 | |||
46 | return markdownIt | ||
47 | } | ||
48 | |||
43 | private setTargetToLinks (markdownIt: MarkdownIt.MarkdownIt) { | 49 | private setTargetToLinks (markdownIt: MarkdownIt.MarkdownIt) { |
44 | // Snippet from markdown-it documentation: https://github.com/markdown-it/markdown-it/blob/master/docs/architecture.md#renderer | 50 | // Snippet from markdown-it documentation: https://github.com/markdown-it/markdown-it/blob/master/docs/architecture.md#renderer |
45 | const defaultRender = markdownIt.renderer.rules.link_open || function (tokens, idx, options, env, self) { | 51 | const defaultRender = markdownIt.renderer.rules.link_open || function (tokens, idx, options, env, self) { |