Skip to content

Commit

Permalink
Merge branch 'MDL-71721-master' of https://github.com/sarjona/moodle
Browse files Browse the repository at this point in the history
  • Loading branch information
@junpataleta
junpataleta committed Jan 13, 2022
2 parents 8b73145 + 9a425a3 commit 0706308
Show file tree
Hide file tree
Showing 6 changed files with 92 additions and 32 deletions.
2 changes: 1 addition & 1 deletion lib/amd/build/emoji/data.min.js
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion lib/amd/build/emoji/data.min.js.map
View file

Large diffs are not rendered by default.

114 changes: 87 additions & 27 deletions lib/amd/src/emoji/data.js
View file
Expand Up @@ -16,7 +16,6 @@
/**
* Emoji data based on the data available from https://github.com/iamcal/emoji-data.
*
* @module core/emoji/data
* @copyright 2019 Ryan Wyllie <ryan@moodle.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
Expand Down Expand Up @@ -247,6 +246,12 @@ export const byCategory = [
"no_mouth"
]
},
{
"unified": "1F636-200D-1F32B-FE0F",
"shortnames": [
"face_in_clouds"
]
},
{
"unified": "1F60F",
"shortnames": [
Expand All @@ -271,6 +276,12 @@ export const byCategory = [
"grimacing"
]
},
{
"unified": "1F62E-200D-1F4A8",
"shortnames": [
"face_exhaling"
]
},
{
"unified": "1F925",
"shortnames": [
Expand Down Expand Up @@ -367,6 +378,12 @@ export const byCategory = [
"dizzy_face"
]
},
{
"unified": "1F635-200D-1F4AB",
"shortnames": [
"face_with_spiral_eyes"
]
},
{
"unified": "1F92F",
"shortnames": [
Expand Down Expand Up @@ -793,6 +810,18 @@ export const byCategory = [
"broken_heart"
]
},
{
"unified": "2764-FE0F-200D-1F525",
"shortnames": [
"heart_on_fire"
]
},
{
"unified": "2764-FE0F-200D-1FA79",
"shortnames": [
"mending_heart"
]
},
{
"unified": "2764-FE0F",
"shortnames": [
Expand Down Expand Up @@ -1284,6 +1313,18 @@ export const byCategory = [
"bearded_person"
]
},
{
"unified": "1F9D4-200D-2642-FE0F",
"shortnames": [
"man_with_beard"
]
},
{
"unified": "1F9D4-200D-2640-FE0F",
"shortnames": [
"woman_with_beard"
]
},
{
"unified": "1F468-200D-1F9B0",
"shortnames": [
Expand Down Expand Up @@ -1921,6 +1962,12 @@ export const byCategory = [
"person_with_headscarf"
]
},
{
"unified": "1F935",
"shortnames": [
"person_in_tuxedo"
]
},
{
"unified": "1F935-200D-2642-FE0F",
"shortnames": [
Expand Down Expand Up @@ -2295,13 +2342,13 @@ export const byCategory = [
{
"unified": "1F46F-200D-2642-FE0F",
"shortnames": [
"man-with-bunny-ears-partying"
"men-with-bunny-ears-partying"
]
},
{
"unified": "1F46F-200D-2640-FE0F",
"shortnames": [
"woman-with-bunny-ears-partying",
"women-with-bunny-ears-partying",
"dancers"
]
},
Expand Down Expand Up @@ -2589,7 +2636,7 @@ export const byCategory = [
{
"unified": "1F46B",
"shortnames": [
"couple"
"man_and_woman_holding_hands"
]
},
{
Expand All @@ -2599,12 +2646,17 @@ export const byCategory = [
]
},
{
"unified": "1F469-200D-2764-FE0F-200D-1F48B-200D-1F468",
"unified": "1F48F",
"shortnames": [
"woman-kiss-man",
"couplekiss"
]
},
{
"unified": "1F469-200D-2764-FE0F-200D-1F48B-200D-1F468",
"shortnames": [
"woman-kiss-man"
]
},
{
"unified": "1F468-200D-2764-FE0F-200D-1F48B-200D-1F468",
"shortnames": [
Expand All @@ -2618,12 +2670,17 @@ export const byCategory = [
]
},
{
"unified": "1F469-200D-2764-FE0F-200D-1F468",
"unified": "1F491",
"shortnames": [
"woman-heart-man",
"couple_with_heart"
]
},
{
"unified": "1F469-200D-2764-FE0F-200D-1F468",
"shortnames": [
"woman-heart-man"
]
},
{
"unified": "1F468-200D-2764-FE0F-200D-1F468",
"shortnames": [
Expand Down Expand Up @@ -2816,12 +2873,6 @@ export const byCategory = [
"shortnames": [
"footprints"
]
},
{
"unified": "1F935",
"shortnames": [
"man_in_tuxedo"
]
}
]
},
Expand Down Expand Up @@ -3470,6 +3521,12 @@ export const byCategory = [
"beetle"
]
},
{
"unified": "1F41E",
"shortnames": [
"ladybug"
]
},
{
"unified": "1F997",
"shortnames": [
Expand Down Expand Up @@ -3661,12 +3718,6 @@ export const byCategory = [
"shortnames": [
"leaves"
]
},
{
"unified": "1F41E",
"shortnames": [
"beetle"
]
}
]
},
Expand Down Expand Up @@ -11303,7 +11354,7 @@ export const byShortName = {
"bug": "1F41B",
"ant": "1F41C",
"bee": "1F41D",
"beetle": "1FAB2",
"ladybug": "1F41E",
"fish": "1F41F",
"tropical_fish": "1F420",
"blowfish": "1F421",
Expand Down Expand Up @@ -11461,14 +11512,14 @@ export const byShortName = {
"woman-kiss-woman": "1F469-200D-2764-FE0F-200D-1F48B-200D-1F469",
"woman": "1F469",
"family": "1F468-200D-1F469-200D-1F466",
"couple": "1F46B",
"man_and_woman_holding_hands": "1F46B",
"two_men_holding_hands": "1F46C",
"two_women_holding_hands": "1F46D",
"female-police-officer": "1F46E-200D-2640-FE0F",
"male-police-officer": "1F46E-200D-2642-FE0F",
"cop": "1F46E-200D-2642-FE0F",
"woman-with-bunny-ears-partying": "1F46F-200D-2640-FE0F",
"man-with-bunny-ears-partying": "1F46F-200D-2642-FE0F",
"women-with-bunny-ears-partying": "1F46F-200D-2640-FE0F",
"men-with-bunny-ears-partying": "1F46F-200D-2642-FE0F",
"dancers": "1F46F-200D-2640-FE0F",
"woman_with_veil": "1F470-200D-2640-FE0F",
"man_with_veil": "1F470-200D-2642-FE0F",
Expand Down Expand Up @@ -11517,9 +11568,9 @@ export const byShortName = {
"love_letter": "1F48C",
"ring": "1F48D",
"gem": "1F48E",
"couplekiss": "1F469-200D-2764-FE0F-200D-1F48B-200D-1F468",
"couplekiss": "1F48F",
"bouquet": "1F490",
"couple_with_heart": "1F469-200D-2764-FE0F-200D-1F468",
"couple_with_heart": "1F491",
"wedding": "1F492",
"heartbeat": "1F493",
"broken_heart": "1F494",
Expand Down Expand Up @@ -11813,14 +11864,17 @@ export const byShortName = {
"tired_face": "1F62B",
"grimacing": "1F62C",
"sob": "1F62D",
"face_exhaling": "1F62E-200D-1F4A8",
"open_mouth": "1F62E",
"hushed": "1F62F",
"cold_sweat": "1F630",
"scream": "1F631",
"astonished": "1F632",
"flushed": "1F633",
"sleeping": "1F634",
"face_with_spiral_eyes": "1F635-200D-1F4AB",
"dizzy_face": "1F635",
"face_in_clouds": "1F636-200D-1F32B-FE0F",
"no_mouth": "1F636",
"mask": "1F637",
"smile_cat": "1F638",
Expand Down Expand Up @@ -12024,7 +12078,8 @@ export const byShortName = {
"selfie": "1F933",
"prince": "1F934",
"woman_in_tuxedo": "1F935-200D-2640-FE0F",
"man_in_tuxedo": "1F935",
"man_in_tuxedo": "1F935-200D-2642-FE0F",
"person_in_tuxedo": "1F935",
"mrs_claus": "1F936",
"woman-shrugging": "1F937-200D-2640-FE0F",
"man-shrugging": "1F937-200D-2642-FE0F",
Expand Down Expand Up @@ -12223,6 +12278,8 @@ export const byShortName = {
"adult": "1F9D1",
"child": "1F9D2",
"older_adult": "1F9D3",
"woman_with_beard": "1F9D4-200D-2640-FE0F",
"man_with_beard": "1F9D4-200D-2642-FE0F",
"bearded_person": "1F9D4",
"person_with_headscarf": "1F9D5",
"woman_in_steamy_room": "1F9D6-200D-2640-FE0F",
Expand Down Expand Up @@ -12329,6 +12386,7 @@ export const byShortName = {
"rock": "1FAA8",
"fly": "1FAB0",
"worm": "1FAB1",
"beetle": "1FAB2",
"cockroach": "1FAB3",
"potted_plant": "1FAB4",
"wood": "1FAB5",
Expand Down Expand Up @@ -12493,6 +12551,8 @@ export const byShortName = {
"grey_exclamation": "2755",
"exclamation": "2757",
"heavy_heart_exclamation_mark_ornament": "2763-FE0F",
"heart_on_fire": "2764-FE0F-200D-1F525",
"mending_heart": "2764-FE0F-200D-1FA79",
"heart": "2764-FE0F",
"heavy_plus_sign": "2795",
"heavy_minus_sign": "2796",
Expand Down
2 changes: 1 addition & 1 deletion lib/emoji-data/generate_emoji_data.php
View file
Expand Up @@ -47,7 +47,7 @@
$category = $data['category'];
$unified = $data['unified'];

if ($category === 'Skin Tones') {
if ($category === 'Component') {
continue;
}

Expand Down
2 changes: 1 addition & 1 deletion lib/emoji-data/readme_moodle.txt
View file
@@ -1,6 +1,6 @@
Description of emoji data import into Moodle.

1. Download the latest release of emoji data from https://github.com/iamcal/emoji-data/releases
1. Download the latest release of emoji data from https://github.com/iamcal/emoji-data/tags

2. Copy emoji_pretty.json into lib/emoji-data/

Expand Down
2 changes: 1 addition & 1 deletion lib/thirdpartylibs.xml
View file
Expand Up @@ -324,7 +324,7 @@
<location>emoji-data</location>
<name>Emoji data</name>
<license>MIT</license>
<version>6.0.0</version>
<version>7.0.2</version>
</library>
<library>
<location>polyfills</location>
Expand Down

0 comments on commit 0706308

Please sign in to comment.