diff options
| author | Clemens <cle1000.cb@gmail.com> | 2016-07-19 12:32:36 +0200 |
|---|---|---|
| committer | Clemens <cle1000.cb@gmail.com> | 2016-07-19 12:32:36 +0200 |
| commit | 698fb11132598a38851383f805dde5ca4d2a046d (patch) | |
| tree | 95fc0184735722ccd6e4697f884496d6852e13f6 /web/src/js/ducks/eventLog.js | |
| parent | 48728af43ad746d70ef3e251dc28b75028dea1e6 (diff) | |
| parent | 18dd84b9081fb5552d5b5b2560405496445e2110 (diff) | |
| download | mitmproxy-698fb11132598a38851383f805dde5ca4d2a046d.tar.gz mitmproxy-698fb11132598a38851383f805dde5ca4d2a046d.tar.bz2 mitmproxy-698fb11132598a38851383f805dde5ca4d2a046d.zip | |
Merge remote-tracking branch 'origin/master' into flow_editing
Diffstat (limited to 'web/src/js/ducks/eventLog.js')
| -rw-r--r-- | web/src/js/ducks/eventLog.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/web/src/js/ducks/eventLog.js b/web/src/js/ducks/eventLog.js index 52eec1cd..f72d7bd6 100644 --- a/web/src/js/ducks/eventLog.js +++ b/web/src/js/ducks/eventLog.js @@ -35,7 +35,7 @@ export default function reduce(state = defaultState, action) { return { ...state, filters, - view: reduceView(state.view, viewActions.updateFilter(state.list, log => filters[log.level])), + view: reduceView(state.view, viewActions.updateFilter(state.list.data, log => filters[log.level])), } case ADD: @@ -55,7 +55,7 @@ export default function reduce(state = defaultState, action) { return { ...state, list: reduceList(state.list, listActions.receive(action.list)), - view: reduceView(state.view, viewActions.receive(list, log => state.filters[log.level])), + view: reduceView(state.view, viewActions.receive(action.list, log => state.filters[log.level])), } default: |