diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2014-09-16 00:05:06 +0200 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2014-09-16 00:05:06 +0200 |
| commit | acdd182754625fabcfc2c6ed4bdad8a63bce8ad6 (patch) | |
| tree | bd48b8c269790d31913a13ecac8969c9d6413f0e /web/src/js/actions.es6.js | |
| parent | 1d9b1f79a11feb57043be1d9d656f4c1638d3357 (diff) | |
| download | mitmproxy-acdd182754625fabcfc2c6ed4bdad8a63bce8ad6.tar.gz mitmproxy-acdd182754625fabcfc2c6ed4bdad8a63bce8ad6.tar.bz2 mitmproxy-acdd182754625fabcfc2c6ed4bdad8a63bce8ad6.zip | |
web: implement EventLogStore
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 |