aboutsummaryrefslogtreecommitdiffhomepage
path: root/client/src/app/videos
diff options
context:
space:
mode:
Diffstat (limited to 'client/src/app/videos')
-rw-r--r--client/src/app/videos/+video-watch/video-watch.component.html4
-rw-r--r--client/src/app/videos/+video-watch/video-watch.component.ts7
2 files changed, 1 insertions, 10 deletions
diff --git a/client/src/app/videos/+video-watch/video-watch.component.html b/client/src/app/videos/+video-watch/video-watch.component.html
index 91e590094..abda5043e 100644
--- a/client/src/app/videos/+video-watch/video-watch.component.html
+++ b/client/src/app/videos/+video-watch/video-watch.component.html
@@ -22,12 +22,10 @@
22 </div> 22 </div>
23 23
24 <div class="video-info-by"> 24 <div class="video-info-by">
25 <a [routerLink]="[ '/videos', 'search' ]" [queryParams]="{ search: video.account.name }" title="Search videos of this account"> 25 <a [routerLink]="[ '/account', video.account.id ]" title="Go the account page">
26 By {{ video.by }} 26 By {{ video.by }}
27 <img [src]="getAvatarPath()" alt="Account avatar" /> 27 <img [src]="getAvatarPath()" alt="Account avatar" />
28 </a> 28 </a>
29
30 <my-video-feed [syndicationItems]="syndicationItems"></my-video-feed>
31 </div> 29 </div>
32 </div> 30 </div>
33 31
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 6f6f02378..4b0c49583 100644
--- a/client/src/app/videos/+video-watch/video-watch.component.ts
+++ b/client/src/app/videos/+video-watch/video-watch.component.ts
@@ -39,8 +39,6 @@ export class VideoWatchComponent implements OnInit, OnDestroy {
39 39
40 otherVideosDisplayed: Video[] = [] 40 otherVideosDisplayed: Video[] = []
41 41
42 syndicationItems = {}
43
44 player: videojs.Player 42 player: videojs.Player
45 playerElement: HTMLVideoElement 43 playerElement: HTMLVideoElement
46 userRating: UserVideoRateType = null 44 userRating: UserVideoRateType = null
@@ -110,7 +108,6 @@ export class VideoWatchComponent implements OnInit, OnDestroy {
110 const startTime = this.route.snapshot.queryParams.start 108 const startTime = this.route.snapshot.queryParams.start
111 this.onVideoFetched(video, startTime) 109 this.onVideoFetched(video, startTime)
112 .catch(err => this.handleError(err)) 110 .catch(err => this.handleError(err))
113 this.generateSyndicationList()
114 }, 111 },
115 112
116 error => { 113 error => {
@@ -247,10 +244,6 @@ export class VideoWatchComponent implements OnInit, OnDestroy {
247 return this.video.tags.join(', ') 244 return this.video.tags.join(', ')
248 } 245 }
249 246
250 generateSyndicationList () {
251 this.syndicationItems = this.videoService.getAccountFeedUrls(this.video.account.id)
252 }
253
254 isVideoRemovable () { 247 isVideoRemovable () {
255 return this.video.isRemovableBy(this.authService.getUser()) 248 return this.video.isRemovableBy(this.authService.getUser())
256 } 249 }