diff options
author | nickago <ngonella@calpoly.edu> | 2015-07-16 14:22:15 -0700 |
---|---|---|
committer | nickago <ngonella@calpoly.edu> | 2015-07-16 14:22:15 -0700 |
commit | 19a34f312b91bd4575d3035ed5aa54369f392d79 (patch) | |
tree | 3a833dd8eab19b352ca575d5e8ba614e489db0b6 /web/react | |
parent | 463e89c280d50c017d8ca5baef5edf90ff9299a7 (diff) | |
download | chat-19a34f312b91bd4575d3035ed5aa54369f392d79.tar.gz chat-19a34f312b91bd4575d3035ed5aa54369f392d79.tar.bz2 chat-19a34f312b91bd4575d3035ed5aa54369f392d79.zip |
Fixed config on our link parser
Diffstat (limited to 'web/react')
-rw-r--r-- | web/react/utils/utils.jsx | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/web/react/utils/utils.jsx b/web/react/utils/utils.jsx index 19c074606..ec2b7e7e8 100644 --- a/web/react/utils/utils.jsx +++ b/web/react/utils/utils.jsx @@ -198,7 +198,13 @@ module.exports.getTimestamp = function() { } var testUrlMatch = function(text) { - var urlMatcher = new Autolinker.matchParser.MatchParser; + var urlMatcher = new Autolinker.matchParser.MatchParser({ + urls: true, + emails: false, + twitter: false, + phone: false, + hashtag: false, + }); var result = []; var replaceFn = function(match) { var linkData = {}; @@ -417,7 +423,6 @@ module.exports.textToJsx = function(text, options) { highlightSearchClass = " search-highlight"; } - if (explicitMention && (UserStore.getProfileByUsername(explicitMention[1]) || Constants.SPECIAL_MENTIONS.indexOf(explicitMention[1]) !== -1)) |