aboutsummaryrefslogtreecommitdiffstats
path: root/web/src/js/ducks/settings.js
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2016-07-21 01:14:55 -0700
committerMaximilian Hils <git@maximilianhils.com>2016-07-21 01:14:55 -0700
commit8a3a21bba1e6706295cc22e1b3a876a7a86cb705 (patch)
tree9408324d45850fd4def75c60cf3537a12f632217 /web/src/js/ducks/settings.js
parent427fffbcb82ba16dd65a4fee4000a05215e859b8 (diff)
downloadmitmproxy-8a3a21bba1e6706295cc22e1b3a876a7a86cb705.tar.gz
mitmproxy-8a3a21bba1e6706295cc22e1b3a876a7a86cb705.tar.bz2
mitmproxy-8a3a21bba1e6706295cc22e1b3a876a7a86cb705.zip
web: fix ValueEditor, clean up code
Diffstat (limited to 'web/src/js/ducks/settings.js')
-rw-r--r--web/src/js/ducks/settings.js9
1 files changed, 3 insertions, 6 deletions
diff --git a/web/src/js/ducks/settings.js b/web/src/js/ducks/settings.js
index 7ad97b87..6b21baec 100644
--- a/web/src/js/ducks/settings.js
+++ b/web/src/js/ducks/settings.js
@@ -11,22 +11,19 @@ export const REQUEST_UPDATE = 'REQUEST_UPDATE'
export const UNKNOWN_CMD = 'SETTINGS_UNKNOWN_CMD'
const defaultState = {
- settings: {},
+
}
export default function reducer(state = defaultState, action) {
switch (action.type) {
case RECEIVE:
- return {
- ...state,
- settings: action.settings,
- }
+ return action.settings
case UPDATE:
return {
...state,
- settings: { ...state.settings, ...action.settings },
+ ...action.settings,
}
default: