diff options
author | Chocobozzz <florian.bigard@gmail.com> | 2017-10-25 16:43:19 +0200 |
---|---|---|
committer | Chocobozzz <florian.bigard@gmail.com> | 2017-10-26 09:11:38 +0200 |
commit | 404b54e14f6623c1644a8c87ca22f4bab98d5484 (patch) | |
tree | 5fbe6cb637f35abae08e4c98a537447cbf4607d6 /client/src/app/videos/+video-watch | |
parent | f5028693a896a3076dd286ac0030e3d8f78f5ebf (diff) | |
download | PeerTube-404b54e14f6623c1644a8c87ca22f4bab98d5484.tar.gz PeerTube-404b54e14f6623c1644a8c87ca22f4bab98d5484.tar.zst PeerTube-404b54e14f6623c1644a8c87ca22f4bab98d5484.zip |
Adapt client with video channels
Diffstat (limited to 'client/src/app/videos/+video-watch')
4 files changed, 9 insertions, 9 deletions
diff --git a/client/src/app/videos/+video-watch/video-download.component.ts b/client/src/app/videos/+video-watch/video-download.component.ts index 22149aa6b..c32f8d586 100644 --- a/client/src/app/videos/+video-watch/video-download.component.ts +++ b/client/src/app/videos/+video-watch/video-download.component.ts | |||
@@ -2,7 +2,7 @@ import { Component, Input, ViewChild } from '@angular/core' | |||
2 | 2 | ||
3 | import { ModalDirective } from 'ngx-bootstrap/modal' | 3 | import { ModalDirective } from 'ngx-bootstrap/modal' |
4 | 4 | ||
5 | import { Video } from '../shared' | 5 | import { VideoDetails } from '../shared' |
6 | 6 | ||
7 | @Component({ | 7 | @Component({ |
8 | selector: 'my-video-download', | 8 | selector: 'my-video-download', |
@@ -10,7 +10,7 @@ import { Video } from '../shared' | |||
10 | styles: [ '.resolution-block { margin-top: 20px; }' ] | 10 | styles: [ '.resolution-block { margin-top: 20px; }' ] |
11 | }) | 11 | }) |
12 | export class VideoDownloadComponent { | 12 | export class VideoDownloadComponent { |
13 | @Input() video: Video = null | 13 | @Input() video: VideoDetails = null |
14 | 14 | ||
15 | @ViewChild('modal') modal: ModalDirective | 15 | @ViewChild('modal') modal: ModalDirective |
16 | 16 | ||
diff --git a/client/src/app/videos/+video-watch/video-report.component.ts b/client/src/app/videos/+video-watch/video-report.component.ts index d9c83a640..fc9b5a9d4 100644 --- a/client/src/app/videos/+video-watch/video-report.component.ts +++ b/client/src/app/videos/+video-watch/video-report.component.ts | |||
@@ -5,14 +5,14 @@ import { ModalDirective } from 'ngx-bootstrap/modal' | |||
5 | import { NotificationsService } from 'angular2-notifications' | 5 | import { NotificationsService } from 'angular2-notifications' |
6 | 6 | ||
7 | import { FormReactive, VideoAbuseService, VIDEO_ABUSE_REASON } from '../../shared' | 7 | import { FormReactive, VideoAbuseService, VIDEO_ABUSE_REASON } from '../../shared' |
8 | import { Video, VideoService } from '../shared' | 8 | import { VideoDetails, VideoService } from '../shared' |
9 | 9 | ||
10 | @Component({ | 10 | @Component({ |
11 | selector: 'my-video-report', | 11 | selector: 'my-video-report', |
12 | templateUrl: './video-report.component.html' | 12 | templateUrl: './video-report.component.html' |
13 | }) | 13 | }) |
14 | export class VideoReportComponent extends FormReactive implements OnInit { | 14 | export class VideoReportComponent extends FormReactive implements OnInit { |
15 | @Input() video: Video = null | 15 | @Input() video: VideoDetails = null |
16 | 16 | ||
17 | @ViewChild('modal') modal: ModalDirective | 17 | @ViewChild('modal') modal: ModalDirective |
18 | 18 | ||
diff --git a/client/src/app/videos/+video-watch/video-share.component.ts b/client/src/app/videos/+video-watch/video-share.component.ts index 414ed28c6..aeef65ecf 100644 --- a/client/src/app/videos/+video-watch/video-share.component.ts +++ b/client/src/app/videos/+video-watch/video-share.component.ts | |||
@@ -2,14 +2,14 @@ import { Component, Input, ViewChild } from '@angular/core' | |||
2 | 2 | ||
3 | import { ModalDirective } from 'ngx-bootstrap/modal' | 3 | import { ModalDirective } from 'ngx-bootstrap/modal' |
4 | 4 | ||
5 | import { Video } from '../shared' | 5 | import { VideoDetails } from '../shared' |
6 | 6 | ||
7 | @Component({ | 7 | @Component({ |
8 | selector: 'my-video-share', | 8 | selector: 'my-video-share', |
9 | templateUrl: './video-share.component.html' | 9 | templateUrl: './video-share.component.html' |
10 | }) | 10 | }) |
11 | export class VideoShareComponent { | 11 | export class VideoShareComponent { |
12 | @Input() video: Video = null | 12 | @Input() video: VideoDetails = null |
13 | 13 | ||
14 | @ViewChild('modal') modal: ModalDirective | 14 | @ViewChild('modal') modal: ModalDirective |
15 | 15 | ||
diff --git a/client/src/app/videos/+video-watch/video-watch.component.ts b/client/src/app/videos/+video-watch/video-watch.component.ts index f45ffd82f..529e2e84f 100644 --- a/client/src/app/videos/+video-watch/video-watch.component.ts +++ b/client/src/app/videos/+video-watch/video-watch.component.ts | |||
@@ -13,7 +13,7 @@ import { AuthService, ConfirmService } from '../../core' | |||
13 | import { VideoDownloadComponent } from './video-download.component' | 13 | import { VideoDownloadComponent } from './video-download.component' |
14 | import { VideoShareComponent } from './video-share.component' | 14 | import { VideoShareComponent } from './video-share.component' |
15 | import { VideoReportComponent } from './video-report.component' | 15 | import { VideoReportComponent } from './video-report.component' |
16 | import { Video, VideoService } from '../shared' | 16 | import { VideoDetails, VideoService } from '../shared' |
17 | import { VideoBlacklistService } from '../../shared' | 17 | import { VideoBlacklistService } from '../../shared' |
18 | import { UserVideoRateType, VideoRateType } from '../../../../../shared' | 18 | import { UserVideoRateType, VideoRateType } from '../../../../../shared' |
19 | 19 | ||
@@ -35,7 +35,7 @@ export class VideoWatchComponent implements OnInit, OnDestroy { | |||
35 | playerElement: HTMLMediaElement | 35 | playerElement: HTMLMediaElement |
36 | uploadSpeed: number | 36 | uploadSpeed: number |
37 | userRating: UserVideoRateType = null | 37 | userRating: UserVideoRateType = null |
38 | video: Video = null | 38 | video: VideoDetails = null |
39 | videoPlayerLoaded = false | 39 | videoPlayerLoaded = false |
40 | videoNotFound = false | 40 | videoNotFound = false |
41 | 41 | ||
@@ -211,7 +211,7 @@ export class VideoWatchComponent implements OnInit, OnDestroy { | |||
211 | ) | 211 | ) |
212 | } | 212 | } |
213 | 213 | ||
214 | private onVideoFetched (video: Video) { | 214 | private onVideoFetched (video: VideoDetails) { |
215 | this.video = video | 215 | this.video = video |
216 | 216 | ||
217 | let observable | 217 | let observable |