summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhmhealey <harrisonmhealey@gmail.com>2015-10-08 12:41:06 -0400
committerhmhealey <harrisonmhealey@gmail.com>2015-10-08 12:43:25 -0400
commitfa8a1ca0987cf2290be4bb3d57a55f3d8e24cd89 (patch)
tree9e0243994f6422717ba9341232d638890f36586a
parent5bcba280c680d66f65088fce9947ef6070e5e941 (diff)
downloadchat-fa8a1ca0987cf2290be4bb3d57a55f3d8e24cd89.tar.gz
chat-fa8a1ca0987cf2290be4bb3d57a55f3d8e24cd89.tar.bz2
chat-fa8a1ca0987cf2290be4bb3d57a55f3d8e24cd89.zip
Fixed parsing of :'( emoticon
-rw-r--r--web/react/utils/emoticons.jsx2
1 files changed, 1 insertions, 1 deletions
diff --git a/web/react/utils/emoticons.jsx b/web/react/utils/emoticons.jsx
index ae1cfda26..508166af9 100644
--- a/web/react/utils/emoticons.jsx
+++ b/web/react/utils/emoticons.jsx
@@ -11,7 +11,7 @@ const emoticonPatterns = {
stuck_out_tongue: /(^|\s)(:-?p)($|\s)/gi, // :p
rage: /(^|\s)(:-?[\[@])($|\s)/g, // :@
frowning: /(^|\s)(:-?\()($|\s)/g, // :(
- sob: /(^|\s)(:['’]-?\(|:&#x27;\()($|\s)/g, // :`(
+ sob: /(^|\s)(:['’]-?\(|:&#x27;\(|:&#39;\()($|\s)/g, // :`(
kissing_heart: /(^|\s)(:-?\*)($|\s)/g, // :*
pensive: /(^|\s)(:-?\/)($|\s)/g, // :/
confounded: /(^|\s)(:-?s)($|\s)/gi, // :s