diff options
author | hmhealey <harrisonmhealey@gmail.com> | 2015-12-07 10:23:01 -0500 |
---|---|---|
committer | hmhealey <harrisonmhealey@gmail.com> | 2015-12-07 14:24:45 -0500 |
commit | 2c832e8f96964eee553a1374d4124aef5f5b06c8 (patch) | |
tree | 3686685a47d83a5e32ac93431949d82c2faeaddc /web | |
parent | b06f11fd632f146a204b4ef1357a8c099bade072 (diff) | |
download | chat-2c832e8f96964eee553a1374d4124aef5f5b06c8.tar.gz chat-2c832e8f96964eee553a1374d4124aef5f5b06c8.tar.bz2 chat-2c832e8f96964eee553a1374d4124aef5f5b06c8.zip |
Removed :* smiley since it conflicts heavily with the markdown parser
Diffstat (limited to 'web')
-rw-r--r-- | web/react/utils/emoticons.jsx | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/web/react/utils/emoticons.jsx b/web/react/utils/emoticons.jsx index ab04936c0..fa5177232 100644 --- a/web/react/utils/emoticons.jsx +++ b/web/react/utils/emoticons.jsx @@ -13,7 +13,6 @@ const emoticonPatterns = { rage: /(^|\s)(:-?[\[@])(?=$|\s)/g, // :@ frowning: /(^|\s)(:-?\()(?=$|\s)/g, // :( sob: /(^|\s)(:['’]-?\(|:'\(|:'\()(?=$|\s)/g, // :`( - kissing_heart: /(^|\s)(:-?\*)(?=$|\s)/g, // :* pensive: /(^|\s)(:-?\/)(?=$|\s)/g, // :/ confounded: /(^|\s)(:-?s)(?=$|\s)/gi, // :s flushed: /(^|\s)(:-?\|)(?=$|\s)/g, // :| |