diff options
| author | Joram Wilander <jwawilander@gmail.com> | 2015-10-20 12:37:51 -0400 |
|---|---|---|
| committer | Joram Wilander <jwawilander@gmail.com> | 2015-10-20 12:37:51 -0400 |
| commit | 4ed9a9ebca82659572af976a7ef9819c4ea63bb8 (patch) | |
| tree | 86bba36ee0e12a3a051d90e706ff7dcbc0fece3b /web | |
| parent | f183f6673f7712234671260c08429a4f7149ffc3 (diff) | |
| parent | 43b5f060c9b5f3a928710415b4fa37b17db3d98a (diff) | |
| download | chat-4ed9a9ebca82659572af976a7ef9819c4ea63bb8.tar.gz chat-4ed9a9ebca82659572af976a7ef9819c4ea63bb8.tar.bz2 chat-4ed9a9ebca82659572af976a7ef9819c4ea63bb8.zip | |
Merge pull request #1100 from girishso/wink_emoji
PLT-699: translate ;) to wink emoji
Diffstat (limited to 'web')
| -rw-r--r-- | web/react/utils/emoticons.jsx | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/web/react/utils/emoticons.jsx b/web/react/utils/emoticons.jsx index 94bb91503..7b43e48b4 100644 --- a/web/react/utils/emoticons.jsx +++ b/web/react/utils/emoticons.jsx @@ -3,6 +3,7 @@ const emoticonPatterns = { smile: /(^|\s)(:-?\))($|\s)/g, // :) + wink: /(^|\s)(;-?\))($|\s)/g, // ;) open_mouth: /(^|\s)(:o)($|\s)/gi, // :o scream: /(^|\s)(:-o)($|\s)/gi, // :-o smirk: /(^|\s)(:-?])($|\s)/g, // :] |