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

Correct break line display for re-draft comments

pull/3262/head
Kimsible 2020-11-06 17:40:40 +01:00 committed by Rigel Kent
parent 61379e4311
commit 6a9498e37c
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -183,7 +183,11 @@ export class VideoCommentAddComponent extends FormReactive implements OnChanges,
this.textareaElement.nativeElement.focus() this.textareaElement.nativeElement.focus()
} }
// Scroll to textarea
this.textareaElement.nativeElement.scrollIntoView({ behavior: 'smooth', block: 'center', inline: 'nearest' }) this.textareaElement.nativeElement.scrollIntoView({ behavior: 'smooth', block: 'center', inline: 'nearest' })
// Use the native textarea autosize according to the text's break lines
this.textareaElement.nativeElement.dispatchEvent(new Event('input'))
}) })
this.form.patchValue({ text }) this.form.patchValue({ text })

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

@ -199,10 +199,13 @@ export class VideoCommentsComponent implements OnInit, OnChanges, OnDestroy {
if (confirm) { if (confirm) {
this.inReplyToCommentId = commentToRedraft.inReplyToCommentId this.inReplyToCommentId = commentToRedraft.inReplyToCommentId
// Display <br /> tag as a break line for editing
const commentToRedraftText = commentToRedraft.text.replace(/<br.?\/?>/g, '\r\n')
if (commentToRedraft.threadId === commentToRedraft.id) { if (commentToRedraft.threadId === commentToRedraft.id) {
this.commentThreadRedraftValue = commentToRedraft.text this.commentThreadRedraftValue = commentToRedraftText
} else { } else {
this.commentReplyRedraftValue = commentToRedraft.text this.commentReplyRedraftValue = commentToRedraftText
} }
} }