about summary refs log tree commit diff
path: root/app/javascript/mastodon/containers/timeline_container.js
diff options
context:
space:
mode:
Diffstat (limited to 'app/javascript/mastodon/containers/timeline_container.js')
-rw-r--r--app/javascript/mastodon/containers/timeline_container.js5
1 files changed, 2 insertions, 3 deletions
diff --git a/app/javascript/mastodon/containers/timeline_container.js b/app/javascript/mastodon/containers/timeline_container.js
index 4be037955..e84c921ee 100644
--- a/app/javascript/mastodon/containers/timeline_container.js
+++ b/app/javascript/mastodon/containers/timeline_container.js
@@ -7,15 +7,14 @@ import { IntlProvider, addLocaleData } from 'react-intl';
 import { getLocale } from '../locales';
 import PublicTimeline from '../features/standalone/public_timeline';
 import HashtagTimeline from '../features/standalone/hashtag_timeline';
+import initialState from '../initial_state';
 
 const { localeData, messages } = getLocale();
 addLocaleData(localeData);
 
 const store = configureStore();
-const initialStateContainer = document.getElementById('initial-state');
 
-if (initialStateContainer !== null) {
-  const initialState = JSON.parse(initialStateContainer.textContent);
+if (initialState) {
   store.dispatch(hydrateStore(initialState));
 }