diff options
| author | Jack <jackdeng@gmail.com> | 2015-09-28 08:14:57 -0700 |
|---|---|---|
| committer | Jack <jackdeng@gmail.com> | 2015-09-28 08:14:57 -0700 |
| commit | 503501ab3b616fb9fa57b046df850cfc2db734f8 (patch) | |
| tree | 43e529250bab982c73816f1ffdf673e8e4b98c13 /web/react/utils/emoticons.jsx | |
| parent | aa6da728baf2f5642293d8b56ebc1ff4e8682bce (diff) | |
| parent | a055fd10b83b28bf97877e4e28a2275f74a71a4a (diff) | |
| download | chat-503501ab3b616fb9fa57b046df850cfc2db734f8.tar.gz chat-503501ab3b616fb9fa57b046df850cfc2db734f8.tar.bz2 chat-503501ab3b616fb9fa57b046df850cfc2db734f8.zip | |
rebase
Diffstat (limited to 'web/react/utils/emoticons.jsx')
| -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, // :| |