diff options
Diffstat (limited to 'client/src/app/shared/shared-custom-markup')
-rw-r--r-- | client/src/app/shared/shared-custom-markup/custom-markup.service.ts | 2 | ||||
-rw-r--r-- | client/src/app/shared/shared-custom-markup/peertube-custom-tags/channel-miniature-markup.component.ts | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/client/src/app/shared/shared-custom-markup/custom-markup.service.ts b/client/src/app/shared/shared-custom-markup/custom-markup.service.ts index d738a644e..618c3dd4f 100644 --- a/client/src/app/shared/shared-custom-markup/custom-markup.service.ts +++ b/client/src/app/shared/shared-custom-markup/custom-markup.service.ts | |||
@@ -58,7 +58,7 @@ export class CustomMarkupService { | |||
58 | } | 58 | } |
59 | 59 | ||
60 | async buildElement (text: string) { | 60 | async buildElement (text: string) { |
61 | const html = await this.markdown.customPageMarkdownToHTML(text, this.getSupportedTags()) | 61 | const html = await this.markdown.customPageMarkdownToHTML({ markdown: text, additionalAllowedTags: this.getSupportedTags() }) |
62 | 62 | ||
63 | const rootElement = document.createElement('div') | 63 | const rootElement = document.createElement('div') |
64 | rootElement.innerHTML = html | 64 | rootElement.innerHTML = html |
diff --git a/client/src/app/shared/shared-custom-markup/peertube-custom-tags/channel-miniature-markup.component.ts b/client/src/app/shared/shared-custom-markup/peertube-custom-tags/channel-miniature-markup.component.ts index e9c466a90..ba12b7139 100644 --- a/client/src/app/shared/shared-custom-markup/peertube-custom-tags/channel-miniature-markup.component.ts +++ b/client/src/app/shared/shared-custom-markup/peertube-custom-tags/channel-miniature-markup.component.ts | |||
@@ -42,7 +42,11 @@ export class ChannelMiniatureMarkupComponent implements CustomMarkupComponent, O | |||
42 | tap(channel => { | 42 | tap(channel => { |
43 | this.channel = channel | 43 | this.channel = channel |
44 | }), | 44 | }), |
45 | switchMap(() => from(this.markdown.textMarkdownToHTML(this.channel.description))), | 45 | switchMap(() => from(this.markdown.textMarkdownToHTML({ |
46 | markdown: this.channel.description, | ||
47 | withEmoji: true, | ||
48 | withHtml: true | ||
49 | }))), | ||
46 | tap(html => { | 50 | tap(html => { |
47 | this.descriptionHTML = html | 51 | this.descriptionHTML = html |
48 | }), | 52 | }), |