Try to handle truncated markdown links
authorChocobozzz <me@florianbigard.com>
Tue, 31 Jul 2018 13:26:48 +0000 (15:26 +0200)
committerChocobozzz <me@florianbigard.com>
Tue, 31 Jul 2018 13:26:48 +0000 (15:26 +0200)
client/src/app/videos/+video-watch/video-watch.component.ts
client/src/app/videos/shared/markdown.service.ts

index afbb0c596eed30cca94c5b221b858f3889e20c38..995fb8e2baf229a932853ce7fbf6bee717325170 100644 (file)
@@ -10,7 +10,7 @@ import { forkJoin, Subscription } from 'rxjs'
 import * as videojs from 'video.js'
 import 'videojs-hotkeys'
 import * as WebTorrent from 'webtorrent'
-import { ResultList, UserVideoRateType, VideoPrivacy, VideoRateType, VideoState } from '../../../../../shared'
+import { UserVideoRateType, VideoPrivacy, VideoRateType, VideoState } from '../../../../../shared'
 import '../../../assets/player/peertube-videojs-plugin'
 import { AuthService, ConfirmService } from '../../core'
 import { RestExtractor, VideoBlacklistService } from '../../shared'
@@ -28,7 +28,6 @@ import { environment } from '../../../environments/environment'
 import { getDevLocale, isOnDevLocale } from '@app/shared/i18n/i18n-utils'
 import { VideoCaptionService } from '@app/shared/video-caption'
 import { VideoCaption } from '../../../../../shared/models/videos/video-caption.model'
-import { VideoJSCaption } from '../../../assets/player/peertube-videojs-typings'
 
 @Component({
   selector: 'my-video-watch',
index 14eeba77750c85acc5aa0091240dd1ee75ad7420..3ef16fdb980a2824a092a354ee5812eb2de4fb68 100644 (file)
@@ -72,5 +72,6 @@ export class MarkdownService {
 
   private avoidTruncatedLinks (html: string) {
     return html.replace(/<a[^>]+>([^<]+)<\/a>\s*...((<\/p>)|(<\/li>)|(<\/strong>))?$/mi, '$1...')
+      .replace(/\[[^\]]+\]?\(?([^\)]+)$/, '$1')
   }
 }