about summary refs log tree commit diff
path: root/app/javascript/mastodon/features/emoji
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2019-03-30 01:41:35 +0100
committerGitHub <noreply@github.com>2019-03-30 01:41:35 +0100
commit8fb69f1366577483f048bf4d69f610087da99cb1 (patch)
tree22e88f004fa76c9091c47d303deacc29592b1ec4 /app/javascript/mastodon/features/emoji
parent79227d153b86144e9a8cc73f1d4045973eabc9ef (diff)
Fix emoji-mart crashing web UI on search by reverting the upgrade to 2.10.0 (#10413)
Fix #10315

This reverts commit db06b25376ac7e844e86fb9890fa9f1c2edd2d60.
Diffstat (limited to 'app/javascript/mastodon/features/emoji')
-rw-r--r--app/javascript/mastodon/features/emoji/emoji_picker.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/javascript/mastodon/features/emoji/emoji_picker.js b/app/javascript/mastodon/features/emoji/emoji_picker.js
index 73fcaa8c8..044d38cb2 100644
--- a/app/javascript/mastodon/features/emoji/emoji_picker.js
+++ b/app/javascript/mastodon/features/emoji/emoji_picker.js
@@ -1,5 +1,5 @@
-import Picker from 'emoji-mart/dist-modern/components/picker/picker';
-import Emoji from 'emoji-mart/dist-modern/components/emoji/emoji';
+import Picker from 'emoji-mart/dist-es/components/picker/picker';
+import Emoji from 'emoji-mart/dist-es/components/emoji/emoji';
 
 export {
   Picker,