-import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'
+import { Component, EventEmitter, Input, OnChanges, OnInit, Output } from '@angular/core'
import * as sanitizeHtml from 'sanitize-html'
import { Account as AccountInterface } from '../../../../../../shared/models/actors'
import { UserRight } from '../../../../../../shared/models/users'
templateUrl: './video-comment.component.html',
styleUrls: ['./video-comment.component.scss']
})
-export class VideoCommentComponent implements OnInit {
+export class VideoCommentComponent implements OnInit, OnChanges {
@Input() video: Video
@Input() comment: VideoComment
@Input() parentComments: VideoComment[] = []
@Input() commentTree: VideoCommentThreadTree
@Input() inReplyToCommentId: number
+ @Input() highlightedComment = false
@Output() wantedToDelete = new EventEmitter<VideoComment>()
@Output() wantedToReply = new EventEmitter<VideoComment>()
}
ngOnInit () {
- this.sanitizedCommentHTML = sanitizeHtml(this.comment.text, {
- allowedTags: [ 'p', 'span' ]
- })
+ this.init()
+ }
- this.newParentComments = this.parentComments.concat([ this.comment ])
+ ngOnChanges () {
+ this.init()
}
onCommentReplyCreated (createdComment: VideoComment) {
this.user.hasRight(UserRight.REMOVE_ANY_VIDEO_COMMENT)
)
}
+
+ private init () {
+ this.sanitizedCommentHTML = sanitizeHtml(this.comment.text, {
+ allowedTags: [ 'p', 'span' ]
+ })
+
+ this.newParentComments = this.parentComments.concat([ this.comment ])
+ }
}
[autoLoading]="true"
(nearOfBottom)="onNearOfBottom()"
>
+ <div *ngIf="highlightedComment" id="highlighted-comment">
+ <my-video-comment
+ [comment]="highlightedComment"
+ [video]="video"
+ [inReplyToCommentId]="inReplyToCommentId"
+ [commentTree]="threadComments[highlightedComment.id]"
+ [highlightedComment]="true"
+ (wantedToReply)="onWantedToReply($event)"
+ (wantedToDelete)="onWantedToDelete($event)"
+ (threadCreated)="onThreadCreated($event)"
+ (resetReply)="onResetReply()"
+ ></my-video-comment>
+ </div>
+
<div *ngFor="let comment of comments">
<my-video-comment
+ *ngIf="!highlightedComment || comment.id !== highlightedComment.id"
[comment]="comment"
[video]="video"
[inReplyToCommentId]="inReplyToCommentId"
(resetReply)="onResetReply()"
></my-video-comment>
- <div *ngIf="comment.totalReplies !== 0 && !threadComments[comment.id]" (click)="viewReplies(comment)" class="view-replies">
+ <div *ngIf="comment.totalReplies !== 0 && !threadComments[comment.id]" (click)="viewReplies(comment.id)" class="view-replies">
View all {{ comment.totalReplies }} replies
<span *ngIf="!threadLoading[comment.id]" class="glyphicon glyphicon-menu-down"></span>
-import { Component, Input, OnChanges, SimpleChanges } from '@angular/core'
+import { Component, Input, OnChanges, OnDestroy, OnInit, SimpleChanges } from '@angular/core'
+import { ActivatedRoute } from '@angular/router'
import { ConfirmService } from '@app/core'
import { NotificationsService } from 'angular2-notifications'
-import { VideoComment as VideoCommentInterface, VideoCommentThreadTree } from '../../../../../../shared/models/videos/video-comment.model'
+import { Subscription } from 'rxjs/Subscription'
+import { VideoCommentThreadTree } from '../../../../../../shared/models/videos/video-comment.model'
import { AuthService } from '../../../core/auth'
import { ComponentPagination } from '../../../shared/rest/component-pagination.model'
import { User } from '../../../shared/users'
import { VideoDetails } from '../../../shared/video/video-details.model'
import { VideoComment } from './video-comment.model'
import { VideoCommentService } from './video-comment.service'
-import { ActivatedRoute } from '@angular/router'
@Component({
selector: 'my-video-comments',
templateUrl: './video-comments.component.html',
styleUrls: ['./video-comments.component.scss']
})
-export class VideoCommentsComponent implements OnChanges {
+export class VideoCommentsComponent implements OnInit, OnChanges, OnDestroy {
@Input() video: VideoDetails
@Input() user: User
comments: VideoComment[] = []
+ highlightedComment: VideoComment
sort: SortField = '-createdAt'
componentPagination: ComponentPagination = {
currentPage: 1,
inReplyToCommentId: number
threadComments: { [ id: number ]: VideoCommentThreadTree } = {}
threadLoading: { [ id: number ]: boolean } = {}
- markedCommentID: number
+
+ private sub: Subscription
constructor (
private authService: AuthService,
private activatedRoute: ActivatedRoute
) {}
+ ngOnInit () {
+ // Find highlighted comment in params
+ this.sub = this.activatedRoute.params.subscribe(
+ params => {
+ if (params['commentId']) {
+ const highlightedCommentId = +params['commentId']
+ this.processHighlightedComment(highlightedCommentId)
+ }
+ }
+ )
+ }
+
ngOnChanges (changes: SimpleChanges) {
if (changes['video']) {
- this.loadVideoComments()
+ this.resetVideo()
}
}
- viewReplies (comment: VideoCommentInterface) {
- this.threadLoading[comment.id] = true
+ ngOnDestroy () {
+ if (this.sub) this.sub.unsubscribe()
+ }
+
+ viewReplies (commentId: number, highlightComment = false) {
+ this.threadLoading[commentId] = true
- this.videoCommentService.getVideoThreadComments(this.video.id, comment.id)
+ this.videoCommentService.getVideoThreadComments(this.video.id, commentId)
.subscribe(
res => {
- this.threadComments[comment.id] = res
- this.threadLoading[comment.id] = false
+ this.threadComments[commentId] = res
+ this.threadLoading[commentId] = false
+
+ if (highlightComment) this.highlightedComment = new VideoComment(res.comment)
},
err => this.notificationsService.error('Error', err.message)
res => {
this.comments = this.comments.concat(res.comments)
this.componentPagination.totalItems = res.totalComments
-
- if (this.markedCommentID) {
- // If there is a marked comment, retrieve it separately as it may not be on this page, filter to prevent duplicate
- this.comments = this.comments.filter(value => value.id !== this.markedCommentID)
- this.videoCommentService.getVideoThreadComments(this.video.id, this.markedCommentID).subscribe(
- res => {
- let comment = new VideoComment(res.comment)
- comment.marked = true
- this.comments.unshift(comment) // Insert marked comment at the beginning
- }
- )
- }
},
err => this.notificationsService.error('Error', err.message)
}
onThreadCreated (commentTree: VideoCommentThreadTree) {
- this.viewReplies(commentTree.comment)
+ this.viewReplies(commentTree.comment.id)
}
onWantedToDelete (commentToDelete: VideoComment) {
}
}
- private loadVideoComments () {
+ private resetVideo () {
if (this.video.commentsEnabled === true) {
// Reset all our fields
+ this.highlightedComment = null
this.comments = []
this.threadComments = {}
this.threadLoading = {}
this.componentPagination.currentPage = 1
this.componentPagination.totalItems = null
- // Find marked comment in params
- this.activatedRoute.params.subscribe(
- params => {
- if (params['commentId']) {
- this.markedCommentID = +params['commentId']
- }
- }
- )
-
this.loadMoreComments()
}
}
+
+ private processHighlightedComment (highlightedCommentId: number) {
+ this.highlightedComment = this.comments.find(c => c.id === highlightedCommentId)
+
+ const highlightComment = true
+ this.viewReplies(highlightedCommentId, highlightComment)
+ }
}
projects / oweals / peertube.git / commitdiff