aboutsummaryrefslogtreecommitdiffstats
path: root/web/src/js/ducks/ui/flow.js
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2017-03-11 14:48:25 +0100
committerGitHub <noreply@github.com>2017-03-11 14:48:25 +0100
commitd069ba9da58beb65d8139c728cc20abcb01de3a4 (patch)
treec77a0439f683cf4b40f718b453b81b72b14ae215 /web/src/js/ducks/ui/flow.js
parent39154e628e8db58db01b5d8f2fd4080736d79bb6 (diff)
parentabcfac3c194b42ccadd9cee8fbf82f3bb7151bed (diff)
downloadmitmproxy-d069ba9da58beb65d8139c728cc20abcb01de3a4.tar.gz
mitmproxy-d069ba9da58beb65d8139c728cc20abcb01de3a4.tar.bz2
mitmproxy-d069ba9da58beb65d8139c728cc20abcb01de3a4.zip
Merge pull request #2133 from MatthewShao/jest-dev
[web] Fixes all existed tests
Diffstat (limited to 'web/src/js/ducks/ui/flow.js')
-rw-r--r--web/src/js/ducks/ui/flow.js7
1 files changed, 4 insertions, 3 deletions
diff --git a/web/src/js/ducks/ui/flow.js b/web/src/js/ducks/ui/flow.js
index fa7474d2..8cb6e170 100644
--- a/web/src/js/ducks/ui/flow.js
+++ b/web/src/js/ducks/ui/flow.js
@@ -60,7 +60,7 @@ export default function reducer(state = defaultState, action) {
// There is no explicit "stop edit" event.
// We stop editing when we receive an update for
// the currently edited flow from the server
- if (action.data.id === state.modifiedFlow.id) {
+ if (action.flow.id === state.modifiedFlow.id) {
return {
...state,
modifiedFlow: false,
@@ -145,9 +145,10 @@ export function setShowFullContent() {
}
export function setContent(content){
- return { type: SET_CONTENT, content}
+ return { type: SET_CONTENT, content }
}
export function stopEdit(flow, modifiedFlow) {
- return flowsActions.update(flow, getDiff(flow, modifiedFlow))
+ let diff = getDiff(flow, modifiedFlow)
+ return {type: flowsActions.UPDATE, flow, diff }
}