summaryrefslogtreecommitdiffstats
path: root/web
diff options
context:
space:
mode:
authorJoram Wilander <jwawilander@gmail.com>2015-07-17 10:19:31 -0400
committerJoram Wilander <jwawilander@gmail.com>2015-07-17 10:19:31 -0400
commit7fae4db6e676c44d23eeff56d856dd13cb77b7e7 (patch)
treef7e49105014ac25d963f89c6cf376c34836bf49f /web
parentf49fccdee356d604a58ad0cddcc2fe5b7ebf5cc8 (diff)
parent5da579cbcc374a67487337c309b189b67c0a788f (diff)
downloadchat-7fae4db6e676c44d23eeff56d856dd13cb77b7e7.tar.gz
chat-7fae4db6e676c44d23eeff56d856dd13cb77b7e7.tar.bz2
chat-7fae4db6e676c44d23eeff56d856dd13cb77b7e7.zip
Merge pull request #198 from nickago/MM-1518
MM-1518 Fixed config on our link parser
Diffstat (limited to 'web')
-rw-r--r--web/react/utils/utils.jsx8
1 files changed, 7 insertions, 1 deletions
diff --git a/web/react/utils/utils.jsx b/web/react/utils/utils.jsx
index 6cae7fe89..7186251e7 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 = {};