From 51b5ffd72b7994eec1d51f8382bcf2acdb6f075b Mon Sep 17 00:00:00 2001
From: hmhealey <harrisonmhealey@gmail.com>
Date: Mon, 7 Dec 2015 12:04:08 -0500
Subject: Removed special handling of snake_case words since that's now done by
 marked

---
 web/react/utils/markdown.jsx | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'web')

diff --git a/web/react/utils/markdown.jsx b/web/react/utils/markdown.jsx
index d600ef069..826b87d08 100644
--- a/web/react/utils/markdown.jsx
+++ b/web/react/utils/markdown.jsx
@@ -69,13 +69,11 @@ class MattermostInlineLexer extends marked.InlineLexer {
 
         this.rules = Object.assign({}, this.rules);
 
-        // modified version of the regex that doesn't break up words in snake_case,
-        // allows for links starting with www, and allows links succounded by parentheses
+        // modified version of the regex that allows for links starting with www and those surrounded by parentheses
         // the original is /^[\s\S]+?(?=[\\<!\[_*`~]|https?:\/\/| {2,}\n|$)/
-        this.rules.text = /^[\s\S]+?(?:[^\w\/](?=_)|(?=_\W|[\\<!\[*`~]|https?:\/\/|www\.|\(| {2,}\n|$))/;
+        this.rules.text = /^[\s\S]+?(?=[\\<!\[_*`~]|https?:\/\/|www\.|\(| {2,}\n|$)/;
 
-        // modified version of the regex that allows links starting with www and those surrounded
-        // by parentheses
+        // modified version of the regex that allows links starting with www and those surrounded by parentheses
         // the original is /^(https?:\/\/[^\s<]+[^<.,:;"')\]\s])/
         this.rules.url = /^(\(?(?:https?:\/\/|www\.)[^\s<.][^\s<]*[^<.,:;"'\]\s])/;
 
-- 
cgit v1.2.3-1-g7c22