summaryrefslogtreecommitdiffstats
path: root/webapp
diff options
context:
space:
mode:
authorjoonsun-baek <joonsun.baek@gmail.com>2016-08-23 03:14:43 +0900
committerHarrison Healey <harrisonmhealey@gmail.com>2016-08-22 14:14:43 -0400
commitec5f9d78892a53d7ae01430261e86ddfd8d4aa00 (patch)
treefa7b58d858e077873bc7df61d194f769e4927a65 /webapp
parentb2a0fb066bb7ebcececd4a77d2af084a0700aa48 (diff)
downloadchat-ec5f9d78892a53d7ae01430261e86ddfd8d4aa00.tar.gz
chat-ec5f9d78892a53d7ae01430261e86ddfd8d4aa00.tar.bz2
chat-ec5f9d78892a53d7ae01430261e86ddfd8d4aa00.zip
PLT-3742 Changed emoticon pattern. (:D > grinning to smile) (#3817)
Diffstat (limited to 'webapp')
-rw-r--r--webapp/utils/emoticons.jsx2
1 files changed, 1 insertions, 1 deletions
diff --git a/webapp/utils/emoticons.jsx b/webapp/utils/emoticons.jsx
index a7d6d84b1..ba54d8cb3 100644
--- a/webapp/utils/emoticons.jsx
+++ b/webapp/utils/emoticons.jsx
@@ -9,7 +9,7 @@ export const emoticonPatterns = {
open_mouth: /(^|\s)(:o)(?=$|\s)/gi, // :o
scream: /(^|\s)(:-o)(?=$|\s)/gi, // :-o
smirk: /(^|\s)(:-?])(?=$|\s)/g, // :]
- grinning: /(^|\s)(:-?d)(?=$|\s)/gi, // :D
+ smile: /(^|\s)(:-?d)(?=$|\s)/gi, // :D
stuck_out_tongue_closed_eyes: /(^|\s)(x-d)(?=$|\s)/gi, // x-d
stuck_out_tongue: /(^|\s)(:-?p)(?=$|\s)/gi, // :p
rage: /(^|\s)(:-?[\[@])(?=$|\s)/g, // :@