X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2Fvideos%2Fshared%2Fmarkdown.service.ts;h=14eeba77750c85acc5aa0091240dd1ee75ad7420;hb=53055a1124cbc2eaeeeeef21b19b0b46e96f23c5;hp=9d73efa4640695eed3b9c7d2650f13a87472044e;hpb=621d99f53f47a11919ec243e05273ecf5907b444;p=github%2FChocobozzz%2FPeerTube.git
diff --git a/client/src/app/videos/shared/markdown.service.ts b/client/src/app/videos/shared/markdown.service.ts
index 9d73efa46..14eeba777 100644
--- a/client/src/app/videos/shared/markdown.service.ts
+++ b/client/src/app/videos/shared/markdown.service.ts
@@ -23,14 +23,16 @@ export class MarkdownService {
}
textMarkdownToHTML (markdown: string) {
- const html = this.textMarkdownIt.render(markdown)
+ if (!markdown) return ''
+ const html = this.textMarkdownIt.render(markdown)
return this.avoidTruncatedLinks(html)
}
enhancedMarkdownToHTML (markdown: string) {
- const html = this.enhancedMarkdownIt.render(markdown)
+ if (!markdown) return ''
+ const html = this.enhancedMarkdownIt.render(markdown)
return this.avoidTruncatedLinks(html)
}
@@ -52,22 +54,23 @@ export class MarkdownService {
return self.renderToken(tokens, idx, options)
}
- markdownIt.renderer.rules.link_open = function (tokens, idx, options, env, self) {
- // If you are sure other plugins can't add `target` - drop check below
- const aIndex = tokens[idx].attrIndex('target')
+ markdownIt.renderer.rules.link_open = function (tokens, index, options, env, self) {
+ const token = tokens[index]
+
+ const targetIndex = token.attrIndex('target')
+ if (targetIndex < 0) token.attrPush([ 'target', '_blank' ])
+ else token.attrs[targetIndex][1] = '_blank'
- if (aIndex < 0) {
- tokens[idx].attrPush(['target', '_blank']) // add new attribute
- } else {
- tokens[idx].attrs[aIndex][1] = '_blank' // replace value of existing attr
- }
+ const relIndex = token.attrIndex('rel')
+ if (relIndex < 0) token.attrPush([ 'rel', 'noopener noreferrer' ])
+ else token.attrs[relIndex][1] = 'noopener noreferrer'
// pass token to default renderer.
- return defaultRender(tokens, idx, options, env, self)
+ return defaultRender(tokens, index, options, env, self)
}
}
- private avoidTruncatedLinks (html) {
- return html.replace(/]+>([^<]+)<\/a>\s*...(<\/p>)?$/mi, '$1...')
+ private avoidTruncatedLinks (html: string) {
+ return html.replace(/]+>([^<]+)<\/a>\s*...((<\/p>)|(<\/li>)|(<\/strong>))?$/mi, '$1...')
}
}