about summary refs log tree commit diff
path: root/app/javascript/mastodon/features/ui/util/async-components.js
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2017-09-23 01:41:00 +0200
committerGitHub <noreply@github.com>2017-09-23 01:41:00 +0200
commit846cd4e8381c891816cf814582304b534db4ee5f (patch)
treefb7c718bd3071bf5128f6c270901623aab54a0f0 /app/javascript/mastodon/features/ui/util/async-components.js
parent0de82dd316839ed329504bfbf9bd0f2d3d96e654 (diff)
Switch from EmojiOne to Twemoji, different emoji picker (#5046)
* Switch from EmojiOne to Twemoji, different emoji picker

* Make emoji-mart use a local spritesheet

* Fix emojify test

* yarn manage:translations
Diffstat (limited to 'app/javascript/mastodon/features/ui/util/async-components.js')
-rw-r--r--app/javascript/mastodon/features/ui/util/async-components.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/javascript/mastodon/features/ui/util/async-components.js b/app/javascript/mastodon/features/ui/util/async-components.js
index c0b93a3a1..bd2fca337 100644
--- a/app/javascript/mastodon/features/ui/util/async-components.js
+++ b/app/javascript/mastodon/features/ui/util/async-components.js
@@ -1,5 +1,5 @@
 export function EmojiPicker () {
-  return import(/* webpackChunkName: "emojione_picker" */'emojione-picker');
+  return import(/* webpackChunkName: "emoji_picker" */'emoji-mart');
 }
 
 export function Compose () {