borekon/PeerTube_original
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix advanced options in upload form

Browse Source
This commit is contained in:
Chocobozzz 2018-09-28 16:17:10 +02:00
parent e182430ac7
commit 8eaa6d62c6
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/src/app/videos/+video-edit/video-add.component.scss
View File

@ -6,7 +6,7 @@ $border-type: solid;
$border-color: #EAEAEA; $border-color: #EAEAEA;
/deep/ .root-tabset.video-add-tabset { /deep/ .root-tabset.video-add-tabset {
&.hide-nav .nav { &.hide-nav > .nav {
display: none !important; display: none !important;
} }

6
client/src/app/videos/shared/markdown.service.ts
View File

@ -26,14 +26,14 @@ export class MarkdownService {
if (!markdown) return '' if (!markdown) return ''
const html = this.textMarkdownIt.render(markdown) const html = this.textMarkdownIt.render(markdown)
return this.avoidTruncatedLinks(html) return this.avoidTruncatedTags(html)
} }
enhancedMarkdownToHTML (markdown: string) { enhancedMarkdownToHTML (markdown: string) {
if (!markdown) return '' if (!markdown) return ''
const html = this.enhancedMarkdownIt.render(markdown) const html = this.enhancedMarkdownIt.render(markdown)
return this.avoidTruncatedLinks(html) return this.avoidTruncatedTags(html)
} }
private createMarkdownIt (rules: string[]) { private createMarkdownIt (rules: string[]) {
@ -70,7 +70,7 @@ export class MarkdownService {
} }
} }
private avoidTruncatedLinks (html: string) { private avoidTruncatedTags (html: string) {
return html.replace(/\*\*?([^*]+)$/, '$1') return html.replace(/\*\*?([^*]+)$/, '$1')
.replace(/<a[^>]+>([^<]+)<\/a>\s*...((<\/p>)|(<\/li>)|(<\/strong>))?$/mi, '$1...') .replace(/<a[^>]+>([^<]+)<\/a>\s*...((<\/p>)|(<\/li>)|(<\/strong>))?$/mi, '$1...')
.replace(/\[[^\]]+\]?\(?([^\)]+)$/, '$1') .replace(/\[[^\]]+\]?\(?([^\)]+)$/, '$1')