diff options
| author | Corey Hulen <corey@hulen.com> | 2015-10-08 09:49:29 -0700 |
|---|---|---|
| committer | Corey Hulen <corey@hulen.com> | 2015-10-08 09:49:29 -0700 |
| commit | 26252ccebf23d8e0ce6cd0f6b79b268e5c3b90fd (patch) | |
| tree | e82aedf48df06bd9802c22a3a8c66e9c5eae2ee0 /web/react/utils/text_formatting.jsx | |
| parent | d30a694d11a0a7ae3474674b8a1a0e3472d4eae1 (diff) | |
| parent | e640bf7b6c1f6b3f20db954b27430261c18accda (diff) | |
| download | chat-26252ccebf23d8e0ce6cd0f6b79b268e5c3b90fd.tar.gz chat-26252ccebf23d8e0ce6cd0f6b79b268e5c3b90fd.tar.bz2 chat-26252ccebf23d8e0ce6cd0f6b79b268e5c3b90fd.zip | |
Merge pull request #971 from mattermost/PLT-567
PLT-567 auto join open channels
Diffstat (limited to 'web/react/utils/text_formatting.jsx')
| -rw-r--r-- | web/react/utils/text_formatting.jsx | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/web/react/utils/text_formatting.jsx b/web/react/utils/text_formatting.jsx index 34e42cbae..b8ed58258 100644 --- a/web/react/utils/text_formatting.jsx +++ b/web/react/utils/text_formatting.jsx @@ -96,8 +96,13 @@ function autolinkUrls(text, tokens) { const index = tokens.size; const alias = `MM_LINK${index}`; + var target = 'target="_blank"'; + if (url.lastIndexOf(Utils.getTeamURLFromAddressBar(), 0) === 0) { + target = ''; + } + tokens.set(alias, { - value: `<a class='theme' target='_blank' href='${url}'>${linkText}</a>`, + value: '<a class="theme"' + target + ' href="${url}">${linkText}</a>', originalText: linkText }); |