OpenCloud
/
PeerTube
mirror of https://github.com/Chocobozzz/PeerTube
1
0
Fork 0
Code Issues Releases Wiki Activity

Support basic markdown in comments

pull/2324/head
Chocobozzz 2019-12-09 11:21:39 +01:00
parent fe9d05310b
commit 1aa7543403
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/src/app/shared/renderer/html-renderer.service.ts
View File

@ -16,7 +16,7 @@ export class HtmlRendererService {
const html = this.linkifier.linkify(text) const html = this.linkifier.linkify(text)
return sanitizeHtml(html, { return sanitizeHtml(html, {
allowedTags: [ 'a', 'p', 'span', 'br' ], allowedTags: [ 'a', 'p', 'span', 'br', 'strong', 'em', 'ul', 'ol', 'li' ],
allowedSchemes: [ 'http', 'https' ], allowedSchemes: [ 'http', 'https' ],
allowedAttributes: { allowedAttributes: {
'a': [ 'href', 'class', 'target' ] 'a': [ 'href', 'class', 'target' ]

6
client/src/app/videos/+video-watch/comment/video-comment.component.ts
View File

@ -4,7 +4,7 @@ import { VideoCommentThreadTree } from '../../../../../../shared/models/videos/v
import { AuthService } from '../../../core/auth' import { AuthService } from '../../../core/auth'
import { Video } from '../../../shared/video/video.model' import { Video } from '../../../shared/video/video.model'
import { VideoComment } from './video-comment.model' import { VideoComment } from './video-comment.model'
import { HtmlRendererService } from '@app/shared/renderer' import { MarkdownService } from '@app/shared/renderer'
@Component({ @Component({
selector: 'my-video-comment', selector: 'my-video-comment',
@ -28,7 +28,7 @@ export class VideoCommentComponent implements OnInit, OnChanges {
newParentComments: VideoComment[] = [] newParentComments: VideoComment[] = []
constructor ( constructor (
private htmlRenderer: HtmlRendererService, private markdownService: MarkdownService,
private authService: AuthService private authService: AuthService
) {} ) {}
@ -86,7 +86,7 @@ export class VideoCommentComponent implements OnInit, OnChanges {
} }
private async init () { private async init () {
this.sanitizedCommentHTML = await this.htmlRenderer.toSafeHtml(this.comment.text) this.sanitizedCommentHTML = await this.markdownService.textMarkdownToHTML(this.comment.text, true)
this.newParentComments = this.parentComments.concat([ this.comment ]) this.newParentComments = this.parentComments.concat([ this.comment ])
} }