diff options
author | Chocobozzz <me@florianbigard.com> | 2018-07-31 15:26:48 +0200 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2018-07-31 15:26:48 +0200 |
commit | 040467f5c8cba429176423d5e4b83bf5379ad101 (patch) | |
tree | 0d81f04cb5072b4588cdee756d715163dc32dd94 /client/src/app/videos | |
parent | cf7a61b5a2b68fd966c4a355e37e84b048ed296b (diff) | |
download | PeerTube-040467f5c8cba429176423d5e4b83bf5379ad101.tar.gz PeerTube-040467f5c8cba429176423d5e4b83bf5379ad101.tar.zst PeerTube-040467f5c8cba429176423d5e4b83bf5379ad101.zip |
Try to handle truncated markdown links
Diffstat (limited to 'client/src/app/videos')
-rw-r--r-- | client/src/app/videos/+video-watch/video-watch.component.ts | 3 | ||||
-rw-r--r-- | client/src/app/videos/shared/markdown.service.ts | 1 |
2 files changed, 2 insertions, 2 deletions
diff --git a/client/src/app/videos/+video-watch/video-watch.component.ts b/client/src/app/videos/+video-watch/video-watch.component.ts index afbb0c596..995fb8e2b 100644 --- a/client/src/app/videos/+video-watch/video-watch.component.ts +++ b/client/src/app/videos/+video-watch/video-watch.component.ts | |||
@@ -10,7 +10,7 @@ import { forkJoin, Subscription } from 'rxjs' | |||
10 | import * as videojs from 'video.js' | 10 | import * as videojs from 'video.js' |
11 | import 'videojs-hotkeys' | 11 | import 'videojs-hotkeys' |
12 | import * as WebTorrent from 'webtorrent' | 12 | import * as WebTorrent from 'webtorrent' |
13 | import { ResultList, UserVideoRateType, VideoPrivacy, VideoRateType, VideoState } from '../../../../../shared' | 13 | import { UserVideoRateType, VideoPrivacy, VideoRateType, VideoState } from '../../../../../shared' |
14 | import '../../../assets/player/peertube-videojs-plugin' | 14 | import '../../../assets/player/peertube-videojs-plugin' |
15 | import { AuthService, ConfirmService } from '../../core' | 15 | import { AuthService, ConfirmService } from '../../core' |
16 | import { RestExtractor, VideoBlacklistService } from '../../shared' | 16 | import { RestExtractor, VideoBlacklistService } from '../../shared' |
@@ -28,7 +28,6 @@ import { environment } from '../../../environments/environment' | |||
28 | import { getDevLocale, isOnDevLocale } from '@app/shared/i18n/i18n-utils' | 28 | import { getDevLocale, isOnDevLocale } from '@app/shared/i18n/i18n-utils' |
29 | import { VideoCaptionService } from '@app/shared/video-caption' | 29 | import { VideoCaptionService } from '@app/shared/video-caption' |
30 | import { VideoCaption } from '../../../../../shared/models/videos/video-caption.model' | 30 | import { VideoCaption } from '../../../../../shared/models/videos/video-caption.model' |
31 | import { VideoJSCaption } from '../../../assets/player/peertube-videojs-typings' | ||
32 | 31 | ||
33 | @Component({ | 32 | @Component({ |
34 | selector: 'my-video-watch', | 33 | selector: 'my-video-watch', |
diff --git a/client/src/app/videos/shared/markdown.service.ts b/client/src/app/videos/shared/markdown.service.ts index 14eeba777..3ef16fdb9 100644 --- a/client/src/app/videos/shared/markdown.service.ts +++ b/client/src/app/videos/shared/markdown.service.ts | |||
@@ -72,5 +72,6 @@ export class MarkdownService { | |||
72 | 72 | ||
73 | private avoidTruncatedLinks (html: string) { | 73 | private avoidTruncatedLinks (html: string) { |
74 | return html.replace(/<a[^>]+>([^<]+)<\/a>\s*...((<\/p>)|(<\/li>)|(<\/strong>))?$/mi, '$1...') | 74 | return html.replace(/<a[^>]+>([^<]+)<\/a>\s*...((<\/p>)|(<\/li>)|(<\/strong>))?$/mi, '$1...') |
75 | .replace(/\[[^\]]+\]?\(?([^\)]+)$/, '$1') | ||
75 | } | 76 | } |
76 | } | 77 | } |