Unfloyded/Legamunt
0
0
Fork 0
Code Activity

retrieve custom emoji list via API instead of before page load (#7047)

Browse source
This commit is contained in:
Isatis 2018-04-04 13:25:34 -07:00 • committed by Eugen Rochko
parent f1867a7388
commit b08ab329f4
4 changed files with 49 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/javascript/mastodon/containers/mastodon.js
View file

@ -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 = {