projects
/
oweals
/
peertube.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Try to fix subscriptions inconsistencies
[oweals/peertube.git]
/
client
/
src
/
app
/
shared
/
video
/
videos-selection.component.ts
diff --git
a/client/src/app/shared/video/videos-selection.component.ts
b/client/src/app/shared/video/videos-selection.component.ts
index 955ebca9fcdf8765bb36c658e05484704e00fb59..0644200568c195a4767fd7d1132dde462738aea1 100644
(file)
--- a/
client/src/app/shared/video/videos-selection.component.ts
+++ b/
client/src/app/shared/video/videos-selection.component.ts
@@
-20,6
+20,8
@@
import { Video } from '@app/shared/video/video.model'
import { PeerTubeTemplateDirective } from '@app/shared/angular/peertube-template.directive'
import { VideoSortField } from '@app/shared/video/sort-field.type'
import { ComponentPagination } from '@app/shared/rest/component-pagination.model'
import { PeerTubeTemplateDirective } from '@app/shared/angular/peertube-template.directive'
import { VideoSortField } from '@app/shared/video/sort-field.type'
import { ComponentPagination } from '@app/shared/rest/component-pagination.model'
+import { I18n } from '@ngx-translate/i18n-polyfill'
+import { ResultList } from '@shared/models'
export type SelectionType = { [ id: number ]: boolean }
export type SelectionType = { [ id: number ]: boolean }
@@
-32,8
+34,8
@@
export class VideosSelectionComponent extends AbstractVideoList implements OnIni
@Input() pagination: ComponentPagination
@Input() titlePage: string
@Input() miniatureDisplayOptions: MiniatureDisplayOptions
@Input() pagination: ComponentPagination
@Input() titlePage: string
@Input() miniatureDisplayOptions: MiniatureDisplayOptions
- @Input() getVideosObservableFunction: (page: number, sort?: VideoSortField) => Observable<
{ videos: Video[], totalVideos: number }
>
- @ContentChildren(PeerTubeTemplateDirective) templates: QueryList<PeerTubeTemplateDirective>
+ @Input() getVideosObservableFunction: (page: number, sort?: VideoSortField) => Observable<
ResultList<Video>
>
+ @ContentChildren(PeerTubeTemplateDirective) templates: QueryList<PeerTubeTemplateDirective
<'rowButtons' | 'globalButtons'>
>
@Output() selectionChange = new EventEmitter<SelectionType>()
@Output() videosModelChange = new EventEmitter<Video[]>()
@Output() selectionChange = new EventEmitter<SelectionType>()
@Output() videosModelChange = new EventEmitter<Video[]>()
@@
-44,6
+46,7
@@
export class VideosSelectionComponent extends AbstractVideoList implements OnIni
globalButtonsTemplate: TemplateRef<any>
constructor (
globalButtonsTemplate: TemplateRef<any>
constructor (
+ protected i18n: I18n,
protected router: Router,
protected route: ActivatedRoute,
protected notifier: Notifier,
protected router: Router,
protected route: ActivatedRoute,
protected notifier: Notifier,