diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2016-06-05 18:23:46 -0700 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2016-06-05 18:23:46 -0700 |
| commit | b6ebde3b1de228c7a3687f1d0de2842f8c0d52d3 (patch) | |
| tree | a7cb170d5e586a4bb75e8ffb766403a661b39fbb /web/src/js/ducks/utils | |
| parent | 2b19a33738b20181d7b6ff10a9ffbf6c51ac96c2 (diff) | |
| parent | e6ef149a03b37d74c7ebbf3a5f3a51e3c7341311 (diff) | |
| download | mitmproxy-b6ebde3b1de228c7a3687f1d0de2842f8c0d52d3.tar.gz mitmproxy-b6ebde3b1de228c7a3687f1d0de2842f8c0d52d3.tar.bz2 mitmproxy-b6ebde3b1de228c7a3687f1d0de2842f8c0d52d3.zip | |
Merge branch 'such-redux'
Diffstat (limited to 'web/src/js/ducks/utils')
| -rw-r--r-- | web/src/js/ducks/utils/list.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/web/src/js/ducks/utils/list.js b/web/src/js/ducks/utils/list.js index a5ce7250..6668e85e 100644 --- a/web/src/js/ducks/utils/list.js +++ b/web/src/js/ducks/utils/list.js @@ -62,7 +62,7 @@ export default function makeList(actionType, fetchURL) { itemIndex = state.indexOf[action.item.id] list[itemIndex] = action.item return { - ...defaultState, + ...state, list } @@ -71,7 +71,7 @@ export default function makeList(actionType, fetchURL) { itemIndex = state.indexOf[action.item.id] list.splice(itemIndex, 1) return { - ...defaultState, + ...state, list, byId: {...state.byId, [action.item.id]: undefined}, indexOf: {...state.indexOf, [action.item.id]: undefined}, @@ -79,7 +79,7 @@ export default function makeList(actionType, fetchURL) { case REQUEST_LIST: return { - ...defaultState, + ...state, isFetching: true } |