aboutsummaryrefslogtreecommitdiffstats
path: root/web/src/js/ducks/view.js
diff options
context:
space:
mode:
authorClemens <cle1000.cb@gmail.com>2016-06-15 00:19:33 +0200
committerClemens <cle1000.cb@gmail.com>2016-06-15 00:19:33 +0200
commit00b4abfe8362748c197a32f7150d8b38a37e3739 (patch)
tree0dba9d15f256169ef004e10fbcf4a31a2155a04f /web/src/js/ducks/view.js
parent003096b4cc4e268642eb842dbe94cd4439db1908 (diff)
downloadmitmproxy-00b4abfe8362748c197a32f7150d8b38a37e3739.tar.gz
mitmproxy-00b4abfe8362748c197a32f7150d8b38a37e3739.tar.bz2
mitmproxy-00b4abfe8362748c197a32f7150d8b38a37e3739.zip
add previous state to dispatch function
Diffstat (limited to 'web/src/js/ducks/view.js')
-rw-r--r--web/src/js/ducks/view.js11
1 files changed, 8 insertions, 3 deletions
diff --git a/web/src/js/ducks/view.js b/web/src/js/ducks/view.js
index 2b6fe67d..b56561d0 100644
--- a/web/src/js/ducks/view.js
+++ b/web/src/js/ducks/view.js
@@ -1,3 +1,5 @@
+import ReduxThunk from 'redux-thunk'
+
import { SELECT_FLOW } from './flows'
const ACTIVE_MENU = 'ACTIVE_MENU'
@@ -13,10 +15,13 @@ export default function reducer(state = defaultState, action) {
active_menu: action.active_menu
}
case SELECT_FLOW:
- return{
- ...state,
- active_menu: action.flowId ? 'Flow' : 'Start'
+ if (!action.currentSelection != !action.flowId){
+ return{
+ ...state,
+ active_menu: action.flowId ? 'Flow' : (state.active_menu == 'Flow' ? 'Start' : state.active_menu)
+ }
}
+ return state
default:
return state
}