diff options
author | Chocobozzz <florian.bigard@gmail.com> | 2017-10-26 15:01:47 +0200 |
---|---|---|
committer | Chocobozzz <florian.bigard@gmail.com> | 2017-10-26 15:01:47 +0200 |
commit | 9d9597df427542eb5c7d3ba8ff5aeb146fab40e2 (patch) | |
tree | 5098facc5f2d70d4ad7871e6736e6f9d9d9a797a /client/src/app/videos/+video-watch | |
parent | 4077df72c634ff17aaf69cc612fc6bb8d68b1ed8 (diff) | |
download | PeerTube-9d9597df427542eb5c7d3ba8ff5aeb146fab40e2.tar.gz PeerTube-9d9597df427542eb5c7d3ba8ff5aeb146fab40e2.tar.zst PeerTube-9d9597df427542eb5c7d3ba8ff5aeb146fab40e2.zip |
Add markdown support to video description
Diffstat (limited to 'client/src/app/videos/+video-watch')
3 files changed, 9 insertions, 6 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 5d5827344..6e502aae2 100644 --- a/client/src/app/videos/+video-watch/video-watch.component.html +++ b/client/src/app/videos/+video-watch/video-watch.component.html | |||
@@ -128,9 +128,7 @@ | |||
128 | Published on {{ video.createdAt | date:'short' }} | 128 | Published on {{ video.createdAt | date:'short' }} |
129 | </div> | 129 | </div> |
130 | 130 | ||
131 | <div class="video-details-description"> | 131 | <div class="video-details-description" [innerHTML]="videoHTMLDescription"></div> |
132 | {{ video.description }} | ||
133 | </div> | ||
134 | </div> | 132 | </div> |
135 | 133 | ||
136 | <div class="video-details-attributes col-xs-4 col-md-3"> | 134 | <div class="video-details-attributes col-xs-4 col-md-3"> |
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 529e2e84f..2e1adb043 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 { VideoDetails, VideoService } from '../shared' | 16 | import { VideoDetails, VideoService, MarkdownService } 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 | ||
@@ -38,6 +38,7 @@ export class VideoWatchComponent implements OnInit, OnDestroy { | |||
38 | video: VideoDetails = null | 38 | video: VideoDetails = null |
39 | videoPlayerLoaded = false | 39 | videoPlayerLoaded = false |
40 | videoNotFound = false | 40 | videoNotFound = false |
41 | videoHTMLDescription = '' | ||
41 | 42 | ||
42 | private paramsSub: Subscription | 43 | private paramsSub: Subscription |
43 | 44 | ||
@@ -50,7 +51,8 @@ export class VideoWatchComponent implements OnInit, OnDestroy { | |||
50 | private confirmService: ConfirmService, | 51 | private confirmService: ConfirmService, |
51 | private metaService: MetaService, | 52 | private metaService: MetaService, |
52 | private authService: AuthService, | 53 | private authService: AuthService, |
53 | private notificationsService: NotificationsService | 54 | private notificationsService: NotificationsService, |
55 | private markdownService: MarkdownService | ||
54 | ) {} | 56 | ) {} |
55 | 57 | ||
56 | ngOnInit () { | 58 | ngOnInit () { |
@@ -259,6 +261,8 @@ export class VideoWatchComponent implements OnInit, OnDestroy { | |||
259 | }) | 261 | }) |
260 | }) | 262 | }) |
261 | 263 | ||
264 | this.videoHTMLDescription = this.markdownService.markdownToHTML(this.video.description) | ||
265 | |||
262 | this.setOpenGraphTags() | 266 | this.setOpenGraphTags() |
263 | this.checkUserRating() | 267 | this.checkUserRating() |
264 | } | 268 | } |
diff --git a/client/src/app/videos/+video-watch/video-watch.module.ts b/client/src/app/videos/+video-watch/video-watch.module.ts index c6c1344ce..1b983200d 100644 --- a/client/src/app/videos/+video-watch/video-watch.module.ts +++ b/client/src/app/videos/+video-watch/video-watch.module.ts | |||
@@ -1,7 +1,7 @@ | |||
1 | import { NgModule } from '@angular/core' | 1 | import { NgModule } from '@angular/core' |
2 | 2 | ||
3 | import { VideoWatchRoutingModule } from './video-watch-routing.module' | 3 | import { VideoWatchRoutingModule } from './video-watch-routing.module' |
4 | import { VideoService } from '../shared' | 4 | import { VideoService, MarkdownService } from '../shared' |
5 | import { SharedModule } from '../../shared' | 5 | import { SharedModule } from '../../shared' |
6 | 6 | ||
7 | import { VideoWatchComponent } from './video-watch.component' | 7 | import { VideoWatchComponent } from './video-watch.component' |
@@ -28,6 +28,7 @@ import { VideoDownloadComponent } from './video-download.component' | |||
28 | ], | 28 | ], |
29 | 29 | ||
30 | providers: [ | 30 | providers: [ |
31 | MarkdownService, | ||
31 | VideoService | 32 | VideoService |
32 | ] | 33 | ] |
33 | }) | 34 | }) |