diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2017-09-30 05:11:44 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-30 05:11:44 +0200 |
| commit | d6fe0954e319b271f3cfbb85df22aba9102746ac (patch) | |
| tree | 995f840e27bf6de19ff9ae9e8dbb0d8be098a9f6 /app/javascript/mastodon/components/autosuggest_emoji.js | |
| parent | ebb8c8920795a31a3188d39b926a5074bb8b69cf (diff) | |
Make emoji autosuggestions immediate, usernames appear sooner (#5149)
* Do not debounce emoji search * Make autosuggestions appear sooner
Diffstat (limited to 'app/javascript/mastodon/components/autosuggest_emoji.js')
| -rw-r--r-- | app/javascript/mastodon/components/autosuggest_emoji.js | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/app/javascript/mastodon/components/autosuggest_emoji.js b/app/javascript/mastodon/components/autosuggest_emoji.js index e2866e8e4..31dc1dbb1 100644 --- a/app/javascript/mastodon/components/autosuggest_emoji.js +++ b/app/javascript/mastodon/components/autosuggest_emoji.js @@ -17,8 +17,13 @@ export default class AutosuggestEmoji extends React.PureComponent { if (emoji.custom) { url = emoji.imageUrl; } else { - const [ filename ] = unicodeMapping[emoji.native]; - url = `${assetHost}/emoji/${filename}.svg`; + const mapping = unicodeMapping[emoji.native] || unicodeMapping[emoji.native.replace(/\uFE0F$/, '')]; + + if (!mapping) { + return null; + } + + url = `${assetHost}/emoji/${mapping[0]}.svg`; } return ( |