diff options
| author | Harrison Healey <harrisonmhealey@gmail.com> | 2016-03-30 13:34:12 -0400 |
|---|---|---|
| committer | Harrison Healey <harrisonmhealey@gmail.com> | 2016-03-30 13:34:12 -0400 |
| commit | bee8daf09405594ed665d36a2b510d3e1b4d1f7b (patch) | |
| tree | 15c5d3d9a09845b41a35d0d7ee75c45b194851c6 /webapp/utils/emoticons.jsx | |
| parent | 6cad40ecf41740ae57a14df12dc363adafb49d18 (diff) | |
| download | chat-bee8daf09405594ed665d36a2b510d3e1b4d1f7b.tar.gz chat-bee8daf09405594ed665d36a2b510d3e1b4d1f7b.tar.bz2 chat-bee8daf09405594ed665d36a2b510d3e1b4d1f7b.zip | |
Added slight smiling, slighting frowning, upside-down smiling, Canada, and Pakistan emojis
Diffstat (limited to 'webapp/utils/emoticons.jsx')
| -rw-r--r-- | webapp/utils/emoticons.jsx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/webapp/utils/emoticons.jsx b/webapp/utils/emoticons.jsx index d3afe372a..86f7a5b7b 100644 --- a/webapp/utils/emoticons.jsx +++ b/webapp/utils/emoticons.jsx @@ -7,7 +7,7 @@ import Constants from './constants.jsx'; import emojis from './emoji.json'; const emoticonPatterns = { - smile: /(^|\s)(:-?\))(?=$|\s)/g, // :) + slightly_smiling_face: /(^|\s)(:-?\))(?=$|\s)/g, // :) wink: /(^|\s)(;-?\))(?=$|\s)/g, // ;) open_mouth: /(^|\s)(:o)(?=$|\s)/gi, // :o scream: /(^|\s)(:-o)(?=$|\s)/gi, // :-o @@ -16,7 +16,7 @@ const emoticonPatterns = { stuck_out_tongue_closed_eyes: /(^|\s)(x-d)(?=$|\s)/gi, // x-d stuck_out_tongue: /(^|\s)(:-?p)(?=$|\s)/gi, // :p rage: /(^|\s)(:-?[\[@])(?=$|\s)/g, // :@ - frowning: /(^|\s)(:-?\()(?=$|\s)/g, // :( + slightly_frowning_face: /(^|\s)(:-?\()(?=$|\s)/g, // :( cry: /(^|\s)(:['’]-?\(|:'\(|:'\()(?=$|\s)/g, // :`( confused: /(^|\s)(:-?\/)(?=$|\s)/g, // :/ confounded: /(^|\s)(:-?s)(?=$|\s)/gi, // :s |