summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarrison Healey <harrisonmhealey@gmail.com>2015-09-03 13:02:16 -0400
committerHarrison Healey <harrisonmhealey@gmail.com>2015-09-03 13:02:16 -0400
commite69e2db6b4724517a39c57e3689dec82608581ee (patch)
tree36d75248a6a90e5b4be89170ad9af7afbeeb0315
parent2b2ce10fede69c2f75d00817aa1061f7d6f277f9 (diff)
parentfede1ae96fd5e28eedca0f2a06c8c16491c82b39 (diff)
downloadchat-e69e2db6b4724517a39c57e3689dec82608581ee.tar.gz
chat-e69e2db6b4724517a39c57e3689dec82608581ee.tar.bz2
chat-e69e2db6b4724517a39c57e3689dec82608581ee.zip
Merge pull request #588 from hmhealey/mm1852
MM-1852 Fixed hashtag regex to only look for words starting with a #
-rw-r--r--web/react/utils/utils.jsx2
1 files changed, 1 insertions, 1 deletions
diff --git a/web/react/utils/utils.jsx b/web/react/utils/utils.jsx
index dc229bd36..ea42256aa 100644
--- a/web/react/utils/utils.jsx
+++ b/web/react/utils/utils.jsx
@@ -457,7 +457,7 @@ export function textToJsx(textin, options) {
var inner = [];
// Function specific regex
- var hashRegex = /^href="#[^']+"|(#[A-Za-z]+[A-Za-z0-9_\-]*[A-Za-z0-9])$/g;
+ var hashRegex = /^href="#[^']+"|(^#[A-Za-z]+[A-Za-z0-9_\-]*[A-Za-z0-9])$/g;
var implicitKeywords = UserStore.getCurrentMentionKeys();