From 2c832e8f96964eee553a1374d4124aef5f5b06c8 Mon Sep 17 00:00:00 2001 From: hmhealey Date: Mon, 7 Dec 2015 10:23:01 -0500 Subject: Removed :* smiley since it conflicts heavily with the markdown parser --- web/react/utils/emoticons.jsx | 1 - 1 file changed, 1 deletion(-) (limited to 'web/react') 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, // :| -- cgit v1.2.3-1-g7c22