tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Glitch] retrieve custom emoji list via API instead of before page load

Browse Source 
Port b08ab329f4 to glitch-soc
This commit is contained in:
Thibaut Girka
2018-04-07 22:05:21 +02:00
parent d55ab8e3e8
commit 1822ce89f9
3 changed files with 49 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/javascript/flavours/glitch/containers/mastodon.js
View File

@ -6,6 +6,7 @@ import { showOnboardingOnce } from 'flavours/glitch/actions/onboarding';
import { BrowserRouter, Route } from 'react-router-dom';
import { ScrollContext } from 'react-router-scroll-4';
import UI from 'flavours/glitch/features/ui';
import { fetchCustomEmojis } from 'flavours/glitch/actions/custom_emojis';
import { hydrateStore } from 'flavours/glitch/actions/store';
import { connectUserStream } from 'flavours/glitch/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 = {