aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2018-06-07 10:32:50 +0200
committerChocobozzz <me@florianbigard.com>2018-06-07 10:32:50 +0200
commitcc69c8db39f48b1053c246458541ccc406228711 (patch)
tree70ec9dbbfbd94f32fb079398cfdb9bfa1dcfdde9
parent5b7c47a781f33bfbeff12c30f5c790bac2378731 (diff)
downloadPeerTube-cc69c8db39f48b1053c246458541ccc406228711.tar.gz
PeerTube-cc69c8db39f48b1053c246458541ccc406228711.tar.zst
PeerTube-cc69c8db39f48b1053c246458541ccc406228711.zip
Fix markdown links truncating
-rw-r--r--client/src/app/videos/shared/markdown.service.ts5
-rw-r--r--client/src/assets/player/peertube-player.ts2
2 files changed, 3 insertions, 4 deletions
diff --git a/client/src/app/videos/shared/markdown.service.ts b/client/src/app/videos/shared/markdown.service.ts
index dd8ff20d8..9a36786b5 100644
--- a/client/src/app/videos/shared/markdown.service.ts
+++ b/client/src/app/videos/shared/markdown.service.ts
@@ -68,7 +68,8 @@ export class MarkdownService {
68 } 68 }
69 } 69 }
70 70
71 private avoidTruncatedLinks (html) { 71 private avoidTruncatedLinks (html: string) {
72 return html.replace(/<a[^>]+>([^<]+)<\/a>\s*...(<\/p>)?$/mi, '$1...') 72 console.log(html)
73 return html.replace(/<a[^>]+>([^<]+)<\/a>\s*...((<\/p>)|(<\/li>)|(<\/strong>))?$/mi, '$1...')
73 } 74 }
74} 75}
diff --git a/client/src/assets/player/peertube-player.ts b/client/src/assets/player/peertube-player.ts
index 1707f34f0..eb75091de 100644
--- a/client/src/assets/player/peertube-player.ts
+++ b/client/src/assets/player/peertube-player.ts
@@ -113,8 +113,6 @@ function getControlBarChildren (options: {
113} 113}
114 114
115function addContextMenu (player: any, videoEmbedUrl: string) { 115function addContextMenu (player: any, videoEmbedUrl: string) {
116 console.log(videoEmbedUrl)
117
118 player.contextmenuUI({ 116 player.contextmenuUI({
119 content: [ 117 content: [
120 { 118 {