Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4463 from xfalcox/emoji-grouping 

FIX: New Emoji had missing group info
This commit is contained in:
Jeff Atwood 2016-09-26 23:20:35 +02:00 committed by GitHub
parent 28ad3cbde6 7149e2ba20
commit a4dd862ad0
1 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
app/assets/javascripts/discourse/lib/emoji/groups.js.es6
View File

@ -171,7 +171,25 @@ const groups = [
"vulcan", "vulcan",
"wind_blowing_face", "wind_blowing_face",
"writing_hand", "writing_hand",
"zipper_mouth" "zipper_mouth",
"female_couple_with_heart",
"male_couple_with_heart",
"female_couplekiss",
"male_couplekiss",
"family_man_woman_girl",
"family_man_woman_girl_boy",
"family_man_woman_boys",
"family_man_woman_girls",
"family_women_boy",
"family_women_girl",
"family_women_girl_boy",
"family_women_boys",
"family_women_girls",
"family_men_boy",
"family_men_girl",
"family_men_girl_boy",
"family_men_boys",
"family_men_girls"
] ]
}, },
{ {
@ -913,6 +931,7 @@ const groups = [
"eight", "eight",
"nine", "nine",
"keycap_ten", "keycap_ten",
"keycap_star",
"1234", "1234",
"hash", "hash",
"abc", "abc",
@ -1102,6 +1121,7 @@ const groups = [
"wastebasket", "wastebasket",
"wheel_of_dharma", "wheel_of_dharma",
"yin_yang", "yin_yang",
"left_speech_bubble"
] ]
} }
]; ];