From 3095dd160e0e3f9d94d0b013d0759ac592a6d485 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Tue, 22 Dec 2015 14:40:49 -0500 Subject: [PATCH] Add `slightly_smiling` emoji and use it as default smile. --- .../discourse/components/d-editor.js.es6 | 2 +- .../discourse/lib/emoji/emoji-groups.js.es6 | 2 +- .../javascripts/discourse/lib/emoji/emoji.js.erb | 4 ++-- lib/emoji/db.json | 12 ++++++++++++ public/images/emoji/apple/slightly_smiling.png | Bin 0 -> 2722 bytes .../images/emoji/emoji_one/slightly_smiling.png | Bin 0 -> 914 bytes public/images/emoji/google/slightly_smiling.png | Bin 0 -> 3905 bytes public/images/emoji/twitter/slightly_smiling.png | Bin 0 -> 815 bytes 8 files changed, 16 insertions(+), 4 deletions(-) create mode 100644 public/images/emoji/apple/slightly_smiling.png create mode 100644 public/images/emoji/emoji_one/slightly_smiling.png create mode 100644 public/images/emoji/google/slightly_smiling.png create mode 100644 public/images/emoji/twitter/slightly_smiling.png diff --git a/app/assets/javascripts/discourse/components/d-editor.js.es6 b/app/assets/javascripts/discourse/components/d-editor.js.es6 index 0898b2cd1..2bf785d33 100644 --- a/app/assets/javascripts/discourse/components/d-editor.js.es6 +++ b/app/assets/javascripts/discourse/components/d-editor.js.es6 @@ -273,7 +273,7 @@ export default Ember.Component.extend({ term = term.toLowerCase(); if (term === "") { - return resolve(["smile", "smiley", "wink", "sunny", "blush"]); + return resolve(["slightly_smiling", "smile", "wink", "sunny", "blush"]); } if (Discourse.Emoji.translations[full]) { diff --git a/app/assets/javascripts/discourse/lib/emoji/emoji-groups.js.es6 b/app/assets/javascripts/discourse/lib/emoji/emoji-groups.js.es6 index 71ef4eb90..e678e4e24 100644 --- a/app/assets/javascripts/discourse/lib/emoji/emoji-groups.js.es6 +++ b/app/assets/javascripts/discourse/lib/emoji/emoji-groups.js.es6 @@ -6,7 +6,7 @@ const groups = [ name: "people", fullname: "People", tabicon: "grinning", - icons: ["grinning", "grin", "joy", "smiley", "smile", "sweat_smile", "laughing", "innocent", "smiling_imp", "imp", "wink", "blush", "relaxed", "yum", "relieved", "heart_eyes", "sunglasses", "smirk", "neutral_face", "expressionless", "unamused", "sweat", "pensive", "confused", "confounded", "kissing", "kissing_heart", "kissing_smiling_eyes", "kissing_closed_eyes", "stuck_out_tongue", "stuck_out_tongue_winking_eye", "stuck_out_tongue_closed_eyes", "disappointed", "worried", "angry", "rage", "cry", "persevere", "triumph", "disappointed_relieved", "frowning", "anguished", "fearful", "weary", "sleepy", "tired_face", "grimacing", "sob", "open_mouth", "hushed", "cold_sweat", "scream", "astonished", "flushed", "sleeping", "dizzy_face", "no_mouth", "mask", "smile_cat", "joy_cat", "smiley_cat", "heart_eyes_cat", "smirk_cat", "kissing_cat", "pouting_cat", "crying_cat_face", "scream_cat", "footprints", "bust_in_silhouette", "busts_in_silhouette", "baby", "boy", "girl", "man", "woman", "family", "couple", "two_men_holding_hands", "two_women_holding_hands", "dancers", "bride_with_veil", "person_with_blond_hair", "man_with_gua_pi_mao", "man_with_turban", "older_man", "older_woman", "cop", "construction_worker", "princess", "guardsman", "angel", "santa", "ghost", "japanese_ogre", "japanese_goblin", "hankey", "skull", "alien", "space_invader", "bow", "information_desk_person", "no_good", "ok_woman", "raising_hand", "person_with_pouting_face", "person_frowning", "massage", "haircut", "couple_with_heart", "couplekiss", "raised_hands", "clap", "hand", "ear", "eyes", "nose", "lips", "kiss", "tongue", "nail_care", "wave", "+1", "-1", "point_up", "point_up_2", "point_down", "point_left", "point_right", "ok_hand", "v", "facepunch", "fist", "raised_hand", "muscle", "open_hands", "pray"] + icons: ["slightly_smiling", "grinning", "grin", "joy", "smiley", "smile", "sweat_smile", "laughing", "innocent", "smiling_imp", "imp", "wink", "blush", "relaxed", "yum", "relieved", "heart_eyes", "sunglasses", "smirk", "neutral_face", "expressionless", "unamused", "sweat", "pensive", "confused", "confounded", "kissing", "kissing_heart", "kissing_smiling_eyes", "kissing_closed_eyes", "stuck_out_tongue", "stuck_out_tongue_winking_eye", "stuck_out_tongue_closed_eyes", "disappointed", "worried", "angry", "rage", "cry", "persevere", "triumph", "disappointed_relieved", "frowning", "anguished", "fearful", "weary", "sleepy", "tired_face", "grimacing", "sob", "open_mouth", "hushed", "cold_sweat", "scream", "astonished", "flushed", "sleeping", "dizzy_face", "no_mouth", "mask", "smile_cat", "joy_cat", "smiley_cat", "heart_eyes_cat", "smirk_cat", "kissing_cat", "pouting_cat", "crying_cat_face", "scream_cat", "footprints", "bust_in_silhouette", "busts_in_silhouette", "baby", "boy", "girl", "man", "woman", "family", "couple", "two_men_holding_hands", "two_women_holding_hands", "dancers", "bride_with_veil", "person_with_blond_hair", "man_with_gua_pi_mao", "man_with_turban", "older_man", "older_woman", "cop", "construction_worker", "princess", "guardsman", "angel", "santa", "ghost", "japanese_ogre", "japanese_goblin", "hankey", "skull", "alien", "space_invader", "bow", "information_desk_person", "no_good", "ok_woman", "raising_hand", "person_with_pouting_face", "person_frowning", "massage", "haircut", "couple_with_heart", "couplekiss", "raised_hands", "clap", "hand", "ear", "eyes", "nose", "lips", "kiss", "tongue", "nail_care", "wave", "+1", "-1", "point_up", "point_up_2", "point_down", "point_left", "point_right", "ok_hand", "v", "facepunch", "fist", "raised_hand", "muscle", "open_hands", "pray"] }, { name: "nature", diff --git a/app/assets/javascripts/discourse/lib/emoji/emoji.js.erb b/app/assets/javascripts/discourse/lib/emoji/emoji.js.erb index 05e79051c..d08fd7070 100644 --- a/app/assets/javascripts/discourse/lib/emoji/emoji.js.erb +++ b/app/assets/javascripts/discourse/lib/emoji/emoji.js.erb @@ -99,8 +99,8 @@ function imageFor(code) { // Also support default emotions var translations = { - ':)' : 'smile', - ':-)' : 'smile', + ':)' : 'slightly_smiling', + ':-)' : 'slightly_smiling', ':(' : 'frowning', ':-(' : 'frowning', ';)' : 'wink', diff --git a/lib/emoji/db.json b/lib/emoji/db.json index 536a025cf..92c985e7d 100644 --- a/lib/emoji/db.json +++ b/lib/emoji/db.json @@ -1,5 +1,17 @@ [ { + "emoji": "🙂" + , "description": "slightly smiling face with closed mouth and smiling eyes" + , "aliases": [ + "slightly_smiling" + ] + , "tags": [ + "happy" + , "joy" + , "pleased" + ] + } +, { "emoji": "😄" , "description": "smiling face with open mouth and smiling eyes" , "aliases": [ diff --git a/public/images/emoji/apple/slightly_smiling.png b/public/images/emoji/apple/slightly_smiling.png new file mode 100644 index 0000000000000000000000000000000000000000..e7328dabefa3cc85543a7ca16625d87650bedf9f GIT binary patch literal 2722 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 literal 0 HcmV?d00001 diff --git a/public/images/emoji/emoji_one/slightly_smiling.png b/public/images/emoji/emoji_one/slightly_smiling.png new file mode 100644 index 0000000000000000000000000000000000000000..5457c7bec228528755014cfc8692e938c9030612 GIT binary patch literal 914 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!?gjXSxB}__chiYPX@2Ve|Nr+f zRXeua|Lc|H&C4hE6q(PTP?6%JzBwT{!9%?=L4R7c_4y6K$=>RbPU>HBD-%7{|3B-U z-(vsu%cuWuR{bxm|NrS&bACXemD>M@Rmb+Oi*Z%||8DdD4}1T=nEwCwn}Trdo0m_9 z*{KCvtMydHuIzQ*Gtaxy#iqr>X<2Y^L4fZ3XpiG@$#HJ#H+P0VIuzZUY1|WTdn_gH zYkpO8sKvBM=OkOh^JyuYr@2Qvt51LKI1T7SzLFrnV21Yw_XQf}7bparcj(_=R>W1# zz`zvh>Eakt!Fcz2Yt>r?9)<_e_On9z=kMIT`*-bs@l~6gc7;B>ZJ#dh7^U#%_s$gO zeCI`LrHi)SDvf1wy7W3Vd-W_P{UDRAKDEA0;hs^6UzaiMoRU`eK008!SQn6)x5q+e`0^6AjB%vrO!Pailfw*AC!=1$AW zGn*a!HvVwi_&xuw&st_6TWQaKf!hX^(i5WB6dG$d>c~9LVHdRC{IElDdqj}2>sVOR{p&^Dmm^m&iyt^T<23t%qnz8^U*_{JP-j%BxGmt| z6(;C#)idRhX(~hTFGC|YE7q&=OG<=p9hg!#b!M3e!wjzO&V`IxI_XjicG*iE(0+N9 zAwr1r!ZW6lJ5I7LpOjw4G~{l+U?%RM-ksU7F7m`tMgz9UbH+Q;#cmyzOi0o1>t z$tkiktSqZK6sNds>g1HzIK@X_&%XV$`S$E=mp!|lOkQ)x<0`2txkb-;=ewQzJvlY%|KFGYe(TG;-~VaP|4U#0W#9j; hKkxniU;h~F9w_ZzbiDlhd0^6G@O1TaS?83{1OSmwy@mh) literal 0 HcmV?d00001 diff --git a/public/images/emoji/google/slightly_smiling.png b/public/images/emoji/google/slightly_smiling.png new file mode 100644 index 0000000000000000000000000000000000000000..6d60982f555beaf75c0fe12d1013bb7af14e3c6a GIT binary patch literal 3905 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 literal 0 HcmV?d00001