X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2Fvideos%2Fshared%2Fmarkdown.service.ts;h=14eeba77750c85acc5aa0091240dd1ee75ad7420;hb=53055a1124cbc2eaeeeeef21b19b0b46e96f23c5;hp=dd8ff20d83181b635eaf4c2725e9c272b11de6d3;hpb=c1dd9b0734336a769f5dce9800b447c3d0e58bb1;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 dd8ff20d8..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) } @@ -68,7 +70,7 @@ export class MarkdownService { } } - 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...') } }