diff options
| author | Joram Wilander <jwawilander@gmail.com> | 2016-02-06 13:41:23 -0500 |
|---|---|---|
| committer | Joram Wilander <jwawilander@gmail.com> | 2016-02-06 13:41:23 -0500 |
| commit | 2e89344863ca0ddbda2679f85e3e399ac7536c81 (patch) | |
| tree | e27a823bb81fb3b7b1dff4578fbc81b44c8fab55 /web | |
| parent | f4bf476441ab2dfe7920d5be40c05205eff4ed94 (diff) | |
| parent | cf9052d284fc6d57c5bf0afce474b72b34a0ecde (diff) | |
| download | chat-2e89344863ca0ddbda2679f85e3e399ac7536c81.tar.gz chat-2e89344863ca0ddbda2679f85e3e399ac7536c81.tar.bz2 chat-2e89344863ca0ddbda2679f85e3e399ac7536c81.zip | |
Merge pull request #2093 from rgarmsen2295/plt-1615
PLT-1615 Limits hashtag links to a minimum of three characters
Diffstat (limited to 'web')
| -rw-r--r-- | web/react/utils/constants.jsx | 3 | ||||
| -rw-r--r-- | web/react/utils/text_formatting.jsx | 8 |
2 files changed, 9 insertions, 2 deletions
diff --git a/web/react/utils/constants.jsx b/web/react/utils/constants.jsx index 64d4ea8a1..d78776aa3 100644 --- a/web/react/utils/constants.jsx +++ b/web/react/utils/constants.jsx @@ -467,5 +467,6 @@ export default { MAX_USERNAME_LENGTH: 64, MIN_PASSWORD_LENGTH: 5, MAX_PASSWORD_LENGTH: 50, - TIME_SINCE_UPDATE_INTERVAL: 30000 + TIME_SINCE_UPDATE_INTERVAL: 30000, + MIN_HASHTAG_LINK_LENGTH: 3 }; diff --git a/web/react/utils/text_formatting.jsx b/web/react/utils/text_formatting.jsx index e837ded53..dae2252a6 100644 --- a/web/react/utils/text_formatting.jsx +++ b/web/react/utils/text_formatting.jsx @@ -248,8 +248,14 @@ function autolinkHashtags(text, tokens) { const index = tokens.size; const alias = `MM_HASHTAG${index}`; + let value = hashtag; + + if (hashtag.length > Constants.MIN_HASHTAG_LINK_LENGTH) { + value = `<a class='mention-link' href='#' data-hashtag='${hashtag}'>${hashtag}</a>`; + } + tokens.set(alias, { - value: `<a class='mention-link' href='#' data-hashtag='${hashtag}'>${hashtag}</a>`, + value, originalText: hashtag }); |