diff options
Diffstat (limited to 'web/src/js/actions.es6.js')
| -rw-r--r-- | web/src/js/actions.es6.js | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/web/src/js/actions.es6.js b/web/src/js/actions.es6.js index b6770074..6b3a5870 100644 --- a/web/src/js/actions.es6.js +++ b/web/src/js/actions.es6.js @@ -1,11 +1,14 @@ var ActionTypes = { SETTINGS_UPDATE: "SETTINGS_UPDATE", - LOG_ADD: "LOG_ADD" + EVENTLOG_ADD: "EVENTLOG_ADD" }; var SettingsActions = { update(settings) { - settings = _.merge({}, SettingsStore.getSettings(), settings); + settings = _.merge({}, SettingsStore.getAll(), settings); + //TODO: Update server. + + //Facebook Flux: We do an optimistic update on the client already. AppDispatcher.dispatchViewAction({ actionType: ActionTypes.SETTINGS_UPDATE, settings: settings |