diff options
| author | =Corey Hulen <corey@hulen.com> | 2015-09-24 12:12:27 -0700 |
|---|---|---|
| committer | =Corey Hulen <corey@hulen.com> | 2015-09-24 12:12:27 -0700 |
| commit | 8ad9a88bda0b6dc3f24945efdbe8b3aa4dcc4360 (patch) | |
| tree | b961f87c1bd9a2428eaee8b5ebd8c9fd1baf0fcc /web/react/utils | |
| parent | a374419ad5c5f35174ee6285b4eaa57ef82235bd (diff) | |
| parent | caa157a3774ee86f0e7003ef4debc49bd88cb9f0 (diff) | |
| download | chat-8ad9a88bda0b6dc3f24945efdbe8b3aa4dcc4360.tar.gz chat-8ad9a88bda0b6dc3f24945efdbe8b3aa4dcc4360.tar.bz2 chat-8ad9a88bda0b6dc3f24945efdbe8b3aa4dcc4360.zip | |
Fixing merge
Diffstat (limited to 'web/react/utils')
| -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, // :| |