aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2017-03-13 14:58:15 +0100
committerGitHub <noreply@github.com>2017-03-13 14:58:15 +0100
commit647d7601b281f2d7e12ff9073618a81d99046aad (patch)
treeb99c20f20e48f5886db9f0de9e1a551287451a35
parent7d5ab70ce3a6deb70aa3e30e755fdee0f3b2fdeb (diff)
parent8a734a2613e44c8535030d622d56353cdebd4390 (diff)
downloadmitmproxy-647d7601b281f2d7e12ff9073618a81d99046aad.tar.gz
mitmproxy-647d7601b281f2d7e12ff9073618a81d99046aad.tar.bz2
mitmproxy-647d7601b281f2d7e12ff9073618a81d99046aad.zip
Merge pull request #2138 from MatthewShao/fix#2133
[web] Fixes the flaw in #2133
-rw-r--r--web/src/js/ducks/ui/flow.js8
1 files changed, 4 insertions, 4 deletions
diff --git a/web/src/js/ducks/ui/flow.js b/web/src/js/ducks/ui/flow.js
index 8cb6e170..ba604ea2 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.flow.id === state.modifiedFlow.id) {
+ if (action.data.id === state.modifiedFlow.id) {
return {
...state,
modifiedFlow: false,
@@ -148,7 +148,7 @@ export function setContent(content){
return { type: SET_CONTENT, content }
}
-export function stopEdit(flow, modifiedFlow) {
- let diff = getDiff(flow, modifiedFlow)
- return {type: flowsActions.UPDATE, flow, diff }
+export function stopEdit(data, modifiedFlow) {
+ let diff = getDiff(data, modifiedFlow)
+ return {type: flowsActions.UPDATE, data, diff }
}