diff options
author | Chocobozzz <me@florianbigard.com> | 2018-05-30 17:10:00 +0200 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2018-05-30 17:10:00 +0200 |
commit | 960a11e89da4e4a6ad6fbad61c71625f89e267b6 (patch) | |
tree | 0cd370970c3166dd3715e46a5503a3da78f25e37 /client/src/app/videos | |
parent | e10c7d5125c47830bd23ecfed2f1b2d1048e6639 (diff) | |
download | PeerTube-960a11e89da4e4a6ad6fbad61c71625f89e267b6.tar.gz PeerTube-960a11e89da4e4a6ad6fbad61c71625f89e267b6.tar.zst PeerTube-960a11e89da4e4a6ad6fbad61c71625f89e267b6.zip |
Add context menu to player
Diffstat (limited to 'client/src/app/videos')
-rw-r--r-- | client/src/app/videos/+video-watch/modal/video-share.component.ts | 6 | ||||
-rw-r--r-- | client/src/app/videos/+video-watch/video-watch.component.ts | 1 |
2 files changed, 3 insertions, 4 deletions
diff --git a/client/src/app/videos/+video-watch/modal/video-share.component.ts b/client/src/app/videos/+video-watch/modal/video-share.component.ts index 678cccfb5..33998c5d8 100644 --- a/client/src/app/videos/+video-watch/modal/video-share.component.ts +++ b/client/src/app/videos/+video-watch/modal/video-share.component.ts | |||
@@ -4,6 +4,7 @@ import { NotificationsService } from 'angular2-notifications' | |||
4 | 4 | ||
5 | import { ModalDirective } from 'ngx-bootstrap/modal' | 5 | import { ModalDirective } from 'ngx-bootstrap/modal' |
6 | import { VideoDetails } from '../../../shared/video/video-details.model' | 6 | import { VideoDetails } from '../../../shared/video/video-details.model' |
7 | import { buildVideoEmbed } from '../../../../assets/player/utils' | ||
7 | 8 | ||
8 | @Component({ | 9 | @Component({ |
9 | selector: 'my-video-share', | 10 | selector: 'my-video-share', |
@@ -28,10 +29,7 @@ export class VideoShareComponent { | |||
28 | } | 29 | } |
29 | 30 | ||
30 | getVideoIframeCode () { | 31 | getVideoIframeCode () { |
31 | return '<iframe width="560" height="315" ' + | 32 | return buildVideoEmbed(this.video.embedUrl) |
32 | 'src="' + this.video.embedUrl + '" ' + | ||
33 | 'frameborder="0" allowfullscreen>' + | ||
34 | '</iframe>' | ||
35 | } | 33 | } |
36 | 34 | ||
37 | getVideoUrl () { | 35 | getVideoUrl () { |
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 35a7c04cc..c71051649 100644 --- a/client/src/app/videos/+video-watch/video-watch.component.ts +++ b/client/src/app/videos/+video-watch/video-watch.component.ts | |||
@@ -348,6 +348,7 @@ export class VideoWatchComponent implements OnInit, OnDestroy { | |||
348 | inactivityTimeout: 2500, | 348 | inactivityTimeout: 2500, |
349 | videoFiles: this.video.files, | 349 | videoFiles: this.video.files, |
350 | playerElement: this.playerElement, | 350 | playerElement: this.playerElement, |
351 | videoEmbedUrl: this.video.embedUrl, | ||
351 | videoViewUrl: this.videoService.getVideoViewUrl(this.video.uuid), | 352 | videoViewUrl: this.videoService.getVideoViewUrl(this.video.uuid), |
352 | videoDuration: this.video.duration, | 353 | videoDuration: this.video.duration, |
353 | enableHotkeys: true, | 354 | enableHotkeys: true, |