summaryrefslogtreecommitdiffstats
path: root/web
diff options
context:
space:
mode:
authorhmhealey <harrisonmhealey@gmail.com>2015-09-24 13:54:48 -0400
committerhmhealey <harrisonmhealey@gmail.com>2015-09-24 13:56:14 -0400
commitfe55c77a41b8a82a68f19f2acb77198eec4f8ca4 (patch)
tree43e0c928dcbbbe40e79f1ba5652eba270c03ae1d /web
parent75b1b43fd85ec4fbf5b669d52fb5195dbfa18631 (diff)
downloadchat-fe55c77a41b8a82a68f19f2acb77198eec4f8ca4.tar.gz
chat-fe55c77a41b8a82a68f19f2acb77198eec4f8ca4.tar.bz2
chat-fe55c77a41b8a82a68f19f2acb77198eec4f8ca4.zip
Removed smilies that start with a semicolon
Diffstat (limited to 'web')
-rw-r--r--web/react/utils/emoticons.jsx7
1 files changed, 3 insertions, 4 deletions
diff --git a/web/react/utils/emoticons.jsx b/web/react/utils/emoticons.jsx
index 7210201ff..a7c837199 100644
--- a/web/react/utils/emoticons.jsx
+++ b/web/react/utils/emoticons.jsx
@@ -5,15 +5,14 @@ const emoticonPatterns = {
smile: /:-?\)/g, // :)
open_mouth: /:o/gi, // :o
scream: /:-o/gi, // :-o
- smirk: /[:;]-?]/g, // :]
- grinning: /[:;]-?d/gi, // :D
+ smirk: /:-?]/g, // :]
+ grinning: /:-?d/gi, // :D
stuck_out_tongue_closed_eyes: /x-d/gi, // x-d
- stuck_out_tongue_winking_eye: /[:;]-?p/gi, // ;p
+ stuck_out_tongue_winking_eye: /:-?p/gi, // :p
rage: /:-?[\[@]/g, // :@
frowning: /:-?\(/g, // :(
sob: /:['’]-?\(|:&#x27;\(/g, // :`(
kissing_heart: /:-?\*/g, // :*
- wink: /;-?\)/g, // ;)
pensive: /:-?\//g, // :/
confounded: /:-?s/gi, // :s
flushed: /:-?\|/g, // :|