diff options
author | Chocobozzz <florian.bigard@gmail.com> | 2017-10-16 10:05:49 +0200 |
---|---|---|
committer | Chocobozzz <florian.bigard@gmail.com> | 2017-10-16 10:07:26 +0200 |
commit | d8755eed1e452d2efbfc983af0e9d228d152bf6b (patch) | |
tree | db94181e7c993f67919f4ea2bb12f08401c437c2 /client/src | |
parent | 334ddfa47120ae53bc2643792ec5e1065a4d1141 (diff) | |
download | PeerTube-d8755eed1e452d2efbfc983af0e9d228d152bf6b.tar.gz PeerTube-d8755eed1e452d2efbfc983af0e9d228d152bf6b.tar.zst PeerTube-d8755eed1e452d2efbfc983af0e9d228d152bf6b.zip |
Add oembed endpoint
Diffstat (limited to 'client/src')
-rw-r--r-- | client/src/app/videos/+video-watch/video-share.component.ts | 2 | ||||
-rw-r--r-- | client/src/app/videos/shared/video.model.ts | 5 | ||||
-rw-r--r-- | client/src/index.html | 4 |
3 files changed, 8 insertions, 3 deletions
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 133f93498..414ed28c6 100644 --- a/client/src/app/videos/+video-watch/video-share.component.ts +++ b/client/src/app/videos/+video-watch/video-share.component.ts | |||
@@ -27,7 +27,7 @@ export class VideoShareComponent { | |||
27 | 27 | ||
28 | getVideoIframeCode () { | 28 | getVideoIframeCode () { |
29 | return '<iframe width="560" height="315" ' + | 29 | return '<iframe width="560" height="315" ' + |
30 | 'src="' + window.location.origin + '/videos/embed/' + this.video.uuid + '" ' + | 30 | 'src="' + this.video.embedUrl + '" ' + |
31 | 'frameborder="0" allowfullscreen>' + | 31 | 'frameborder="0" allowfullscreen>' + |
32 | '</iframe>' | 32 | '</iframe>' |
33 | } | 33 | } |
diff --git a/client/src/app/videos/shared/video.model.ts b/client/src/app/videos/shared/video.model.ts index b315e59b1..51c5319ea 100644 --- a/client/src/app/videos/shared/video.model.ts +++ b/client/src/app/videos/shared/video.model.ts | |||
@@ -26,6 +26,8 @@ export class Video implements VideoServerModel { | |||
26 | thumbnailUrl: string | 26 | thumbnailUrl: string |
27 | previewPath: string | 27 | previewPath: string |
28 | previewUrl: string | 28 | previewUrl: string |
29 | embedPath: string | ||
30 | embedUrl: string | ||
29 | views: number | 31 | views: number |
30 | likes: number | 32 | likes: number |
31 | dislikes: number | 33 | dislikes: number |
@@ -64,6 +66,7 @@ export class Video implements VideoServerModel { | |||
64 | tags: string[], | 66 | tags: string[], |
65 | thumbnailPath: string, | 67 | thumbnailPath: string, |
66 | previewPath: string, | 68 | previewPath: string, |
69 | embedPath: string, | ||
67 | views: number, | 70 | views: number, |
68 | likes: number, | 71 | likes: number, |
69 | dislikes: number, | 72 | dislikes: number, |
@@ -91,6 +94,8 @@ export class Video implements VideoServerModel { | |||
91 | this.thumbnailUrl = API_URL + hash.thumbnailPath | 94 | this.thumbnailUrl = API_URL + hash.thumbnailPath |
92 | this.previewPath = hash.previewPath | 95 | this.previewPath = hash.previewPath |
93 | this.previewUrl = API_URL + hash.previewPath | 96 | this.previewUrl = API_URL + hash.previewPath |
97 | this.embedPath = hash.embedPath | ||
98 | this.embedUrl = API_URL + hash.embedPath | ||
94 | this.views = hash.views | 99 | this.views = hash.views |
95 | this.likes = hash.likes | 100 | this.likes = hash.likes |
96 | this.dislikes = hash.dislikes | 101 | this.dislikes = hash.dislikes |
diff --git a/client/src/index.html b/client/src/index.html index 91ed04d17..8e94b903d 100644 --- a/client/src/index.html +++ b/client/src/index.html | |||
@@ -7,8 +7,8 @@ | |||
7 | <meta name="viewport" content="width=device-width, initial-scale=1"> | 7 | <meta name="viewport" content="width=device-width, initial-scale=1"> |
8 | <meta name="description" content="PeerTube, a decentralized video streaming platform using P2P (BitTorrent) directly in the web browser" /> | 8 | <meta name="description" content="PeerTube, a decentralized video streaming platform using P2P (BitTorrent) directly in the web browser" /> |
9 | 9 | ||
10 | <!-- The following comment is used by the server to prerender OpenGraph tags --> | 10 | <!-- The following comment is used by the server to prerender OpenGraph and oEmbed tags --> |
11 | <!-- open graph tags --> | 11 | <!-- open graph and oembed tags --> |
12 | <!-- Do not remove it! --> | 12 | <!-- Do not remove it! --> |
13 | 13 | ||
14 | <link rel="icon" type="image/png" href="/client/assets/favicon.png" /> | 14 | <link rel="icon" type="image/png" href="/client/assets/favicon.png" /> |