diff options
author | Isatis <515462+Reverite@users.noreply.github.com> | 2018-04-04 13:25:34 -0700 |
---|---|---|
committer | Eugen Rochko <eugen@zeonfederated.com> | 2018-04-04 22:25:34 +0200 |
commit | b08ab329f4d149fd414e0539574f49062c571a8a (patch) | |
tree | 0e99cecdab27a0bbe4e745284726dcd1905f6fac /app/javascript/mastodon/containers | |
parent | f1867a73881444dfed9e093425435681ee764922 (diff) |
retrieve custom emoji list via API instead of before page load (#7047)
Diffstat (limited to 'app/javascript/mastodon/containers')
-rw-r--r-- | app/javascript/mastodon/containers/mastodon.js | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/app/javascript/mastodon/containers/mastodon.js b/app/javascript/mastodon/containers/mastodon.js index d1710445b..b29898d3b 100644 --- a/app/javascript/mastodon/containers/mastodon.js +++ b/app/javascript/mastodon/containers/mastodon.js @@ -6,6 +6,7 @@ import { showOnboardingOnce } from '../actions/onboarding'; import { BrowserRouter, Route } from 'react-router-dom'; import { ScrollContext } from 'react-router-scroll-4'; import UI from '../features/ui'; +import { fetchCustomEmojis } from '../actions/custom_emojis'; import { hydrateStore } from '../actions/store'; import { connectUserStream } from '../actions/streaming'; import { IntlProvider, addLocaleData } from 'react-intl'; @@ -19,6 +20,9 @@ export const store = configureStore(); const hydrateAction = hydrateStore(initialState); store.dispatch(hydrateAction); +// load custom emojis +store.dispatch(fetchCustomEmojis()); + export default class Mastodon extends React.PureComponent { static propTypes = { |