Added App Setttings Modal

2017-06-28 22:00:54 -07:00
parent 6cbbdc805f
commit 595c6de32c
19 changed files with 561 additions and 94 deletions
--- a/app/javascript/mastodon/containers/mastodon.js
+++ b/app/javascript/mastodon/containers/mastodon.js
@@ -25,9 +25,9 @@ addLocaleData(localeData);
 const store = configureStore();
 const initialState = JSON.parse(document.getElementById('initial-state').textContent);
 try {
-  initialState.localSettings = JSON.parse(localStorage.getItem('mastodon-settings'));
+  initialState.local_settings = JSON.parse(localStorage.getItem('mastodon-settings'));
 } catch (e) {
-  initialState.localSettings = {};
+  initialState.local_settings = {};
 }
 store.dispatch(hydrateStore(initialState));