Added Markdown formatting in playlist descriptions

Implements https://github.com/Chocobozzz/PeerTube/issues/3627

diff --git a/client/src/app/+my-library/my-video-playlists/my-video-playlist-edit.component.html b/client/src/app/+my-library/my-video-playlists/my-video-playlist-edit.component.html
index 9b9befca41b10f4e487ef45961e45627623c8fcb..c39e90a1e417cabd6fc76fb7dda8c0d8f6e4b4bd 100644 (file)
--- a/client/src/app/+my-library/my-video-playlists/my-video-playlist-edit.component.html
+++ b/client/src/app/+my-library/my-video-playlists/my-video-playlist-edit.component.html
@@ -41,11 +41,11 @@
         </div>
 
         <div class="form-group">
-          <label i18n for="description">Description</label>
-          <textarea
+          <label i18n for="description">Description</label><my-help helpType="markdownText"></my-help>
+          <my-markdown-textarea
             id="description" formControlName="description"
-            class="form-control" [ngClass]="{ 'input-error': formErrors['description'] }"
-          ></textarea>
+            [ngClass]="{ 'input-error': formErrors['description'] }"
+          ></my-markdown-textarea>
           <div *ngIf="formErrors.description" class="form-error">
             {{ formErrors.description }}
           </div>

diff --git a/client/src/app/+my-library/my-video-playlists/my-video-playlist-edit.component.scss b/client/src/app/+my-library/my-video-playlists/my-video-playlist-edit.component.scss
index 420391322a5abd6075a7d8c57ee7b54c79625cfb..47c323d6d2b55d538c62ac05f92a01ca3b2dd0b7 100644 (file)
--- a/client/src/app/+my-library/my-video-playlists/my-video-playlist-edit.component.scss
+++ b/client/src/app/+my-library/my-video-playlists/my-video-playlist-edit.component.scss
@@ -16,12 +16,6 @@ input[type=text] {
   display: block;
 }
 
-textarea {
-  @include peertube-textarea(500px, 150px);
-
-  display: block;
-}
-
 .peertube-select-container {
   @include peertube-select-container(340px);
 }

diff --git a/client/src/app/shared/shared-video-playlist/video-playlist-miniature.component.html b/client/src/app/shared/shared-video-playlist/video-playlist-miniature.component.html
index 95f11f03038a55989f9f7902e3ff69f85d19f1b7..3cccbe0807cae01ecf708fcff40cd68afb5ad8e1 100644 (file)
--- a/client/src/app/shared/shared-video-playlist/video-playlist-miniature.component.html
+++ b/client/src/app/shared/shared-video-playlist/video-playlist-miniature.component.html
@@ -32,6 +32,6 @@
       <span i18n class="updated-at">Updated {{ playlist.updatedAt | myFromNow }}</span>
     </div>
 
-    <div *ngIf="displayDescription" class="video-info-description">{{ playlist.description }}</div>
+    <div *ngIf="displayDescription" class="video-info-description" [innerHTML]="playlistDescription"></div>
   </div>
 </div>

diff --git a/client/src/app/shared/shared-video-playlist/video-playlist-miniature.component.ts b/client/src/app/shared/shared-video-playlist/video-playlist-miniature.component.ts
index c80ea2e6b0f2cb8fe9931b0b1b4b173a7f400204..dd9fe0a5aae9a02b319b20e7fa9aa553147c9177 100644 (file)
--- a/client/src/app/shared/shared-video-playlist/video-playlist-miniature.component.ts
+++ b/client/src/app/shared/shared-video-playlist/video-playlist-miniature.component.ts
@@ -1,6 +1,7 @@
 import { LinkType } from 'src/types/link.type'
 import { Component, Input, OnInit } from '@angular/core'
 import { VideoPlaylist } from './video-playlist.model'
+import { MarkdownService } from '@app/core'
 
 @Component({
   selector: 'my-video-playlist-miniature',
@@ -22,9 +23,17 @@ export class VideoPlaylistMiniatureComponent implements OnInit {
   routerLink: any
   playlistHref: string
   playlistTarget: string
+  playlistDescription: string
 
-  ngOnInit () {
+  constructor (
+    private markdownService: MarkdownService
+  ) {}
+
+  async ngOnInit () {
     this.buildPlaylistUrl()
+    if (this.displayDescription) {
+      this.playlistDescription = await this.markdownService.textMarkdownToHTML(this.playlist.description)
+    }
   }
 
   buildPlaylistUrl () {