diff options
author | Chocobozzz <me@florianbigard.com> | 2018-02-14 17:16:32 +0100 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2018-02-14 17:16:32 +0100 |
commit | 8cac1b6446a97b16387c9590ce5c799a79a759fa (patch) | |
tree | 6ef95c108b9323e47d1b979a01934398b0752dac /client/src/app/videos | |
parent | a16aee73db627908dc83eb5c29b213ce8d1fab39 (diff) | |
download | PeerTube-8cac1b6446a97b16387c9590ce5c799a79a759fa.tar.gz PeerTube-8cac1b6446a97b16387c9590ce5c799a79a759fa.tar.zst PeerTube-8cac1b6446a97b16387c9590ce5c799a79a759fa.zip |
Move adding a video view videojs peertube plugin
Diffstat (limited to 'client/src/app/videos')
-rw-r--r-- | client/src/app/videos/+video-watch/video-watch.component.ts | 20 |
1 files changed, 3 insertions, 17 deletions
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 8330aba15..b7779ae9a 100644 --- a/client/src/app/videos/+video-watch/video-watch.component.ts +++ b/client/src/app/videos/+video-watch/video-watch.component.ts | |||
@@ -329,7 +329,8 @@ export class VideoWatchComponent implements OnInit, OnDestroy { | |||
329 | peertube: { | 329 | peertube: { |
330 | videoFiles: this.video.files, | 330 | videoFiles: this.video.files, |
331 | playerElement: this.playerElement, | 331 | playerElement: this.playerElement, |
332 | peerTubeLink: false | 332 | peerTubeLink: false, |
333 | videoViewUrl: this.videoService.getVideoViewUrl(this.video.uuid) | ||
333 | }, | 334 | }, |
334 | hotkeys: { | 335 | hotkeys: { |
335 | enableVolumeScroll: false | 336 | enableVolumeScroll: false |
@@ -349,7 +350,7 @@ export class VideoWatchComponent implements OnInit, OnDestroy { | |||
349 | }) | 350 | }) |
350 | }) | 351 | }) |
351 | } else { | 352 | } else { |
352 | this.player.peertube().setVideoFiles(this.video.files) | 353 | this.player.peertube().setVideoFiles(this.video.files, this.videoService.getVideoViewUrl(this.video.uuid)) |
353 | } | 354 | } |
354 | 355 | ||
355 | this.setVideoDescriptionHTML() | 356 | this.setVideoDescriptionHTML() |
@@ -357,8 +358,6 @@ export class VideoWatchComponent implements OnInit, OnDestroy { | |||
357 | 358 | ||
358 | this.setOpenGraphTags() | 359 | this.setOpenGraphTags() |
359 | this.checkUserRating() | 360 | this.checkUserRating() |
360 | |||
361 | this.prepareViewAdd() | ||
362 | } | 361 | } |
363 | ) | 362 | ) |
364 | } | 363 | } |
@@ -431,19 +430,6 @@ export class VideoWatchComponent implements OnInit, OnDestroy { | |||
431 | this.metaService.setTag('url', window.location.href) | 430 | this.metaService.setTag('url', window.location.href) |
432 | } | 431 | } |
433 | 432 | ||
434 | private prepareViewAdd () { | ||
435 | // After 30 seconds (or 3/4 of the video), increment add a view | ||
436 | let viewTimeoutSeconds = 30 | ||
437 | if (this.video.duration < viewTimeoutSeconds) viewTimeoutSeconds = (this.video.duration * 3) / 4 | ||
438 | |||
439 | setTimeout(() => { | ||
440 | this.videoService | ||
441 | .viewVideo(this.video.uuid) | ||
442 | .subscribe() | ||
443 | |||
444 | }, viewTimeoutSeconds * 1000) | ||
445 | } | ||
446 | |||
447 | private isAutoplay () { | 433 | private isAutoplay () { |
448 | // True by default | 434 | // True by default |
449 | if (!this.user) return true | 435 | if (!this.user) return true |