luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-11-20 13:53:30 +00:00
Code Issues Projects Releases Wiki Activity

Fix regression from #3748 - properly set defaultColumns (#3750)

Browse source
This commit is contained in:
Eugen Rochko 2017-06-14 23:07:06 +02:00 committed by GitHub
parent da0333f1cb
commit bb911043de
1 changed files with 2 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
app/javascript/mastodon/reducers/settings.js
View file

@ -60,12 +60,7 @@ const defaultColumns = Immutable.fromJS([
{ id: 'NOTIFICATIONS', uuid: uuid(), params: {} }, { id: 'NOTIFICATIONS', uuid: uuid(), params: {} },
]); ]);
const hydrate = (settings) => { const hydrate = (state, settings) => state.mergeDeep(settings).update('columns', (val = defaultColumns) => val);
return initialState.withMutations((state) => {
state.mergeDeep(settings);
state.update('columns', defaultColumns, val => val);
});
};
const moveColumn = (state, uuid, direction) => { const moveColumn = (state, uuid, direction) => {
const columns = state.get('columns'); const columns = state.get('columns');
@ -83,7 +78,7 @@ const moveColumn = (state, uuid, direction) => {
export default function settings(state = initialState, action) { export default function settings(state = initialState, action) {
switch(action.type) { switch(action.type) {
case STORE_HYDRATE: case STORE_HYDRATE:
return hydrate(action.state.get('settings')); return hydrate(state, action.state.get('settings'));
case SETTING_CHANGE: case SETTING_CHANGE:
return state.setIn(action.key, action.value); return state.setIn(action.key, action.value);
case COLUMN_ADD: case COLUMN_ADD: