diff options
| author | =Corey Hulen <corey@hulen.com> | 2015-10-20 14:50:03 -0700 |
|---|---|---|
| committer | =Corey Hulen <corey@hulen.com> | 2015-10-20 14:50:03 -0700 |
| commit | e1f94590290bf3061fdce48b25b2e74a2c8a0853 (patch) | |
| tree | b67ae40ea40f64f2e6c5a29e50b78199ed9a2c63 /web/react/utils/emoticons.jsx | |
| parent | 1fc12dd8ba2238eba7d154eee55e1381e7415372 (diff) | |
| parent | e0cda76eb816da8fda9c42d67197be71201c242e (diff) | |
| download | chat-e1f94590290bf3061fdce48b25b2e74a2c8a0853.tar.gz chat-e1f94590290bf3061fdce48b25b2e74a2c8a0853.tar.bz2 chat-e1f94590290bf3061fdce48b25b2e74a2c8a0853.zip | |
Merge branch 'master' into PLT-44
Diffstat (limited to 'web/react/utils/emoticons.jsx')
| -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, // :] |