Merge pull request #88 from savardc/textVsEmoticon

Text representation of emoji is different from emoticon
nolan/hinaloe-test
Etienne Lemay 2017-06-21 14:02:27 -04:00 committed by GitHub
commit 48f83e001e
2 changed files with 6 additions and 6 deletions

View File

@ -90,11 +90,12 @@ Sheets are served from [unpkg](https://unpkg.com), a global CDN that serves file
id: 'smiley', id: 'smiley',
name: 'Smiling Face with Open Mouth', name: 'Smiling Face with Open Mouth',
colons: ':smiley:', colons: ':smiley:',
text: ':)',
emoticons: [ emoticons: [
'=)', '=)',
'=-)' '=-)'
], ],
skin: null, skin: null,
native: '😃' native: '😃'
} }
@ -102,6 +103,7 @@ Sheets are served from [unpkg](https://unpkg.com), a global CDN that serves file
id: 'santa', id: 'santa',
name: 'Father Christmas', name: 'Father Christmas',
colons: ':santa::skin-tone-3:', colons: ':santa::skin-tone-3:',
text: '',
emoticons: [], emoticons: [],
skin: 3, skin: 3,
native: '🎅🏼' native: '🎅🏼'
@ -111,6 +113,7 @@ Sheets are served from [unpkg](https://unpkg.com), a global CDN that serves file
id: 'octocat', id: 'octocat',
name: 'Octocat', name: 'Octocat',
colons: ':octocat', colons: ':octocat',
text: '',
emoticons: [], emoticons: [],
custom: true, custom: true,
imageUrl: 'https://assets-cdn.github.com/images/icons/emoji/octocat.png?v7' imageUrl: 'https://assets-cdn.github.com/images/icons/emoji/octocat.png?v7'
@ -150,6 +153,7 @@ const customEmojis = [
{ {
name: 'Octocat', name: 'Octocat',
short_names: ['octocat'], short_names: ['octocat'],
text: '',
emoticons: [], emoticons: [],
keywords: ['github'], keywords: ['github'],
imageUrl: 'https://assets-cdn.github.com/images/icons/emoji/octocat.png?v7' imageUrl: 'https://assets-cdn.github.com/images/icons/emoji/octocat.png?v7'

View File

@ -42,11 +42,7 @@ emojiData.forEach((datum) => {
} }
datum.emoticons = datum.texts || [] datum.emoticons = datum.texts || []
if (datum.text && !datum.emoticons.length) { datum.text = datum.text || ''
datum.emoticons = [datum.text]
}
delete datum.text
delete datum.texts delete datum.texts
if (emojiLib.lib[datum.short_name]) { if (emojiLib.lib[datum.short_name]) {