treehouse
/
emoji-mart-lazyload
18
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Handle unknown emojis [Fix #14]

release
Etienne Lemay 2016-10-12 20:26:10 -04:00
parent ac4feba228
commit 8f64b3c7d1
2 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/components/emoji.js
View File

@ -59,7 +59,12 @@ export default class Emoji extends React.Component {
} }
render() { render() {
var { sheetURL, size, onOver, onLeave } = this.props var { sheetURL, size, onOver, onLeave } = this.props,
{ unified } = this.getData()
if (!unified) {
return null
}
return <span return <span
onClick={this.handleClick.bind(this)} onClick={this.handleClick.bind(this)}

11
src/utils/index.js
View File

@ -36,14 +36,19 @@ function getSanitizedData() {
} }
function getData(emoji, skin, sheetURL) { function getData(emoji, skin, sheetURL) {
var emojiData = {} var emojiData = {},
_emojiData = null
if (typeof emoji == 'string') { if (typeof emoji == 'string') {
emojiData = data.emojis[emoji] if (_emojiData = data.emojis[emoji]) {
emojiData = _emojiData
}
} else if (emoji.id) { } else if (emoji.id) {
emojiData = data.emojis[emoji.id] if (_emojiData = data.emojis[emoji.id]) {
emojiData = _emojiData
skin || (skin = emoji.skin) skin || (skin = emoji.skin)
} }
}
if (emojiData.skin_variations && skin > 1 && sheetURL) { if (emojiData.skin_variations && skin > 1 && sheetURL) {
emojiData = JSON.parse(JSON.stringify(emojiData)) emojiData = JSON.parse(JSON.stringify(emojiData))