diff options
author | Nolan Lawson <nolan@nolanlawson.com> | 2017-10-27 08:04:44 -0700 |
---|---|---|
committer | unarist <m.unarist@gmail.com> | 2017-10-28 00:04:44 +0900 |
commit | 3de22a82bf1c3c0a3b593be4075cf42a3ec9291e (patch) | |
tree | 7b11776880a6122287b7fa0a84e0649bb346be86 /app/javascript/mastodon/containers/mastodon.js | |
parent | e4080772b511e8dd436fddc79de10f44e4d83ff6 (diff) |
Refactor initial state: reduce_motion and auto_play_gif (#5501)
Diffstat (limited to 'app/javascript/mastodon/containers/mastodon.js')
-rw-r--r-- | app/javascript/mastodon/containers/mastodon.js | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/javascript/mastodon/containers/mastodon.js b/app/javascript/mastodon/containers/mastodon.js index 56b7bda46..e1d89a5b8 100644 --- a/app/javascript/mastodon/containers/mastodon.js +++ b/app/javascript/mastodon/containers/mastodon.js @@ -10,12 +10,13 @@ import { hydrateStore } from '../actions/store'; import { connectUserStream } from '../actions/streaming'; import { IntlProvider, addLocaleData } from 'react-intl'; import { getLocale } from '../locales'; +import initialState from '../initial_state'; const { localeData, messages } = getLocale(); addLocaleData(localeData); export const store = configureStore(); -const hydrateAction = hydrateStore(JSON.parse(document.getElementById('initial-state').textContent)); +const hydrateAction = hydrateStore(initialState); store.dispatch(hydrateAction); export default class Mastodon extends React.PureComponent { |