diff options
| author | nickago <ngonella@calpoly.edu> | 2015-06-30 11:56:55 -0700 |
|---|---|---|
| committer | nickago <ngonella@calpoly.edu> | 2015-06-30 11:57:57 -0700 |
| commit | bcc31b714b19ff3817c96c801028e23ace8cc55b (patch) | |
| tree | 9ca11d12039146bec180fd5a0c1ac2c4974da5e1 /web/react/utils | |
| parent | 7a7be75e742603d06927a488b136e1ed4432aac2 (diff) | |
| download | chat-bcc31b714b19ff3817c96c801028e23ace8cc55b.tar.gz chat-bcc31b714b19ff3817c96c801028e23ace8cc55b.tar.bz2 chat-bcc31b714b19ff3817c96c801028e23ace8cc55b.zip | |
Added the ability to have hashtags with dashes in them
Diffstat (limited to 'web/react/utils')
| -rw-r--r-- | web/react/utils/utils.jsx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/web/react/utils/utils.jsx b/web/react/utils/utils.jsx index d50a044bc..175fc2922 100644 --- a/web/react/utils/utils.jsx +++ b/web/react/utils/utils.jsx @@ -395,8 +395,8 @@ module.exports.textToJsx = function(text, options) { var inner = []; - // Function specific regexes - var hashRegex = /^href="#[^"]+"|(#[A-Za-z]+[A-Za-z0-9_]*[A-Za-z0-9])$/g; + // Function specific regex + var hashRegex = /^href="#[^"]+"|(#[A-Za-z]+[A-Za-z0-9_\-]*[A-Za-z0-9])$/g; var implicitKeywords = {}; var keywordArray = UserStore.getCurrentMentionKeys(); |