diff options
author | Christopher Speller <crspeller@gmail.com> | 2015-09-24 14:52:08 -0400 |
---|---|---|
committer | Christopher Speller <crspeller@gmail.com> | 2015-09-24 14:52:08 -0400 |
commit | 6d3e836668c6e0420d007540e6fa3b67e5875464 (patch) | |
tree | 34f1eebd7010e98373a65d68d02d15fca927eba2 | |
parent | d077655ffcf02ba06aa4fee6fafee0b62b8e79a2 (diff) | |
parent | fe55c77a41b8a82a68f19f2acb77198eec4f8ca4 (diff) | |
download | chat-6d3e836668c6e0420d007540e6fa3b67e5875464.tar.gz chat-6d3e836668c6e0420d007540e6fa3b67e5875464.tar.bz2 chat-6d3e836668c6e0420d007540e6fa3b67e5875464.zip |
Merge pull request #788 from hmhealey/plt379
PLT-379 Removed smilies that start with a semicolon
-rw-r--r-- | web/react/utils/emoticons.jsx | 7 |
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: /:['’]-?\(|:'\(/g, // :`( kissing_heart: /:-?\*/g, // :* - wink: /;-?\)/g, // ;) pensive: /:-?\//g, // :/ confounded: /:-?s/gi, // :s flushed: /:-?\|/g, // :| |