about summary refs log tree commit diff
path: root/app/javascript
diff options
context:
space:
mode:
authorrinsuki <428rinsuki+git@gmail.com>2019-02-05 07:14:57 +0900
committerEugen Rochko <eugen@zeonfederated.com>2019-02-04 23:14:57 +0100
commite02a13f64e5c2c93fa73a67a4ce32a7d1df24760 (patch)
tree214b24e53a484e44cbbc0bacf4059dd8d74db306 /app/javascript
parent88f35f339d19eed87bb3b55ebd5ed2303726aa78 (diff)
Fix not showing custom emojis in share page emoji picker (#9970)
Diffstat (limited to 'app/javascript')
-rw-r--r--app/javascript/mastodon/containers/compose_container.js3
1 files changed, 3 insertions, 0 deletions
diff --git a/app/javascript/mastodon/containers/compose_container.js b/app/javascript/mastodon/containers/compose_container.js
index 5ee1d2f14..7bc7bbaa4 100644
--- a/app/javascript/mastodon/containers/compose_container.js
+++ b/app/javascript/mastodon/containers/compose_container.js
@@ -7,6 +7,7 @@ import { IntlProvider, addLocaleData } from 'react-intl';
 import { getLocale } from '../locales';
 import Compose from '../features/standalone/compose';
 import initialState from '../initial_state';
+import { fetchCustomEmojis } from '../actions/custom_emojis';
 
 const { localeData, messages } = getLocale();
 addLocaleData(localeData);
@@ -17,6 +18,8 @@ if (initialState) {
   store.dispatch(hydrateStore(initialState));
 }
 
+store.dispatch(fetchCustomEmojis());
+
 export default class TimelineContainer extends React.PureComponent {
 
   static propTypes = {