-import { Component, Input, OnChanges, OnDestroy, OnInit, SimpleChanges, ViewChild, ElementRef } from '@angular/core'
+import { Component, ElementRef, Input, OnChanges, OnDestroy, OnInit, SimpleChanges, ViewChild } from '@angular/core'
import { ActivatedRoute } from '@angular/router'
-import { ConfirmService } from '@app/core'
-import { NotificationsService } from 'angular2-notifications'
+import { ConfirmService, Notifier } from '@app/core'
import { Subscription } from 'rxjs'
import { VideoCommentThreadTree } from '../../../../../../shared/models/videos/video-comment.model'
import { AuthService } from '../../../core/auth'
-import { ComponentPagination } from '../../../shared/rest/component-pagination.model'
+import { ComponentPagination, hasMoreItems } from '../../../shared/rest/component-pagination.model'
import { User } from '../../../shared/users'
import { VideoSortField } from '../../../shared/video/sort-field.type'
import { VideoDetails } from '../../../shared/video/video-details.model'
import { VideoComment } from './video-comment.model'
import { VideoCommentService } from './video-comment.service'
import { I18n } from '@ngx-translate/i18n-polyfill'
+import { Syndication } from '@app/shared/video/syndication.model'
@Component({
selector: 'my-video-comments',
threadComments: { [ id: number ]: VideoCommentThreadTree } = {}
threadLoading: { [ id: number ]: boolean } = {}
+ syndicationItems: Syndication[] = []
+
private sub: Subscription
constructor (
private authService: AuthService,
- private notificationsService: NotificationsService,
+ private notifier: Notifier,
private confirmService: ConfirmService,
private videoCommentService: VideoCommentService,
private activatedRoute: ActivatedRoute,
this.highlightedThread = new VideoComment(res.comment)
// Scroll to the highlighted thread
- setTimeout(() => {
- // -60 because of the fixed header
- console.log(this.commentHighlightBlock.nativeElement.offsetTop)
- const scrollY = this.commentHighlightBlock.nativeElement.offsetTop - 60
- window.scroll(0, scrollY)
- }, 500)
+ setTimeout(() => this.commentHighlightBlock.nativeElement.scrollIntoView(), 0)
}
},
- err => this.notificationsService.error(this.i18n('Error'), err.message)
+ err => this.notifier.error(err.message)
)
}
this.componentPagination.totalItems = res.totalComments
},
- err => this.notificationsService.error(this.i18n('Error'), err.message)
+ err => this.notifier.error(err.message)
)
}
// Delete the thread
this.comments = this.comments.filter(c => c.id !== commentToDelete.id)
this.componentPagination.totalItems--
+
+ if (this.highlightedThread.id === commentToDelete.id) this.highlightedThread = undefined
},
- err => this.notificationsService.error(this.i18n('Error'), err.message)
+ err => this.notifier.error(err.message)
)
}
onNearOfBottom () {
this.componentPagination.currentPage++
- if (this.hasMoreComments()) {
+ if (hasMoreItems(this.componentPagination)) {
this.loadMoreComments()
}
}
- private hasMoreComments () {
- // No results
- if (this.componentPagination.totalItems === 0) return false
-
- // Not loaded yet
- if (!this.componentPagination.totalItems) return true
-
- const maxPage = this.componentPagination.totalItems / this.componentPagination.itemsPerPage
- return maxPage > this.componentPagination.currentPage
- }
-
private deleteLocalCommentThread (parentComment: VideoCommentThreadTree, commentToDelete: VideoComment) {
for (const commentChild of parentComment.children) {
if (commentChild.comment.id === commentToDelete.id) {
this.componentPagination.currentPage = 1
this.componentPagination.totalItems = null
+ this.syndicationItems = this.videoCommentService.getVideoCommentsFeeds(this.video.uuid)
+
this.loadMoreComments()
}
}