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 @@
         Published on {{ video.createdAt | date:'short' }}
       </div>
 
-      <div class="video-details-description">
-        {{ video.description }}
-      </div>
+      <div class="video-details-description" [innerHTML]="videoHTMLDescription"></div>
     </div>
 
     <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'
 import { VideoDownloadComponent } from './video-download.component'
 import { VideoShareComponent } from './video-share.component'
 import { VideoReportComponent } from './video-report.component'
-import { VideoDetails, VideoService } from '../shared'
+import { VideoDetails, VideoService, MarkdownService } from '../shared'
 import { VideoBlacklistService } from '../../shared'
 import { UserVideoRateType, VideoRateType } from '../../../../../shared'
 
@@ -38,6 +38,7 @@ export class VideoWatchComponent implements OnInit, OnDestroy {
   video: VideoDetails = null
   videoPlayerLoaded = false
   videoNotFound = false
+  videoHTMLDescription = ''
 
   private paramsSub: Subscription
 
@@ -50,7 +51,8 @@ export class VideoWatchComponent implements OnInit, OnDestroy {
     private confirmService: ConfirmService,
     private metaService: MetaService,
     private authService: AuthService,
-    private notificationsService: NotificationsService
+    private notificationsService: NotificationsService,
+    private markdownService: MarkdownService
   ) {}
 
   ngOnInit () {
@@ -259,6 +261,8 @@ export class VideoWatchComponent implements OnInit, OnDestroy {
           })
         })
 
+        this.videoHTMLDescription = this.markdownService.markdownToHTML(this.video.description)
+
         this.setOpenGraphTags()
         this.checkUserRating()
       }
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 @@
 import { NgModule } from '@angular/core'
 
 import { VideoWatchRoutingModule } from './video-watch-routing.module'
-import { VideoService } from '../shared'
+import { VideoService, MarkdownService } from '../shared'
 import { SharedModule } from '../../shared'
 
 import { VideoWatchComponent } from './video-watch.component'
@@ -28,6 +28,7 @@ import { VideoDownloadComponent } from './video-download.component'
   ],
 
   providers: [
+    MarkdownService,
     VideoService
   ]
 })