Better settings handling with localSettings (new!)

2017-06-24 19:12:34 -07:00
parent 4c37f629bc
commit da05cde721
5 changed files with 52 additions and 6 deletions
--- a/app/javascript/mastodon/containers/mastodon.js
+++ b/app/javascript/mastodon/containers/mastodon.js
@@ -24,7 +24,11 @@ addLocaleData(localeData);

 const store = configureStore();
 const initialState = JSON.parse(document.getElementById('initial-state').textContent);
-if (localStorage) initialState.layout = localStorage.getItem('mastodon-layout');
+try {
+  initialState.localSettings = JSON.parse(localStorage.getItem('mastodon-settings'));
+} catch (e) {
+  initialState.localSettings = {};
+}
 store.dispatch(hydrateStore(initialState));

 export default class Mastodon extends React.PureComponent {