From: Chocobozzz Date: Fri, 28 Sep 2018 14:17:10 +0000 (+0200) Subject: Fix advanced options in upload form X-Git-Tag: v1.0.0-beta.16~17 X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=8eaa6d62c6c5659dae7db16f3718327df572a91c;p=github%2FChocobozzz%2FPeerTube.git Fix advanced options in upload form --- diff --git a/client/src/app/videos/+video-edit/video-add.component.scss b/client/src/app/videos/+video-edit/video-add.component.scss index ab70e0e24..dd97b79ee 100644 --- a/client/src/app/videos/+video-edit/video-add.component.scss +++ b/client/src/app/videos/+video-edit/video-add.component.scss @@ -6,7 +6,7 @@ $border-type: solid; $border-color: #EAEAEA; /deep/ .root-tabset.video-add-tabset { - &.hide-nav .nav { + &.hide-nav > .nav { display: none !important; } diff --git a/client/src/app/videos/shared/markdown.service.ts b/client/src/app/videos/shared/markdown.service.ts index b302d9052..07017eca5 100644 --- a/client/src/app/videos/shared/markdown.service.ts +++ b/client/src/app/videos/shared/markdown.service.ts @@ -26,14 +26,14 @@ export class MarkdownService { if (!markdown) return '' const html = this.textMarkdownIt.render(markdown) - return this.avoidTruncatedLinks(html) + return this.avoidTruncatedTags(html) } enhancedMarkdownToHTML (markdown: string) { if (!markdown) return '' const html = this.enhancedMarkdownIt.render(markdown) - return this.avoidTruncatedLinks(html) + return this.avoidTruncatedTags(html) } private createMarkdownIt (rules: string[]) { @@ -70,7 +70,7 @@ export class MarkdownService { } } - private avoidTruncatedLinks (html: string) { + private avoidTruncatedTags (html: string) { return html.replace(/\*\*?([^*]+)$/, '$1') .replace(/]+>([^<]+)<\/a>\s*...((<\/p>)|(<\/li>)|(<\/strong>))?$/mi, '$1...') .replace(/\[[^\]]+\]?\(?([^\)]+)$/, '$1')