diff options
| author | Aldo Cortesi <aldo@nullcube.com> | 2016-06-07 12:56:51 +1200 |
|---|---|---|
| committer | Aldo Cortesi <aldo@nullcube.com> | 2016-06-07 12:56:51 +1200 |
| commit | 75ebd638eb6f6ed74f1f191d4f9e30277f4f2d34 (patch) | |
| tree | 9bff77b84d485549f2d9cfad61a4c54b6315088d /web/src/js/ducks/utils/list.js | |
| parent | e037fe05ff1f0c2893b3f51e06e0261ca4245d63 (diff) | |
| parent | 80292c0ac3c9684ee945546c9b45334178518e4e (diff) | |
| download | mitmproxy-75ebd638eb6f6ed74f1f191d4f9e30277f4f2d34.tar.gz mitmproxy-75ebd638eb6f6ed74f1f191d4f9e30277f4f2d34.tar.bz2 mitmproxy-75ebd638eb6f6ed74f1f191d4f9e30277f4f2d34.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'web/src/js/ducks/utils/list.js')
| -rw-r--r-- | web/src/js/ducks/utils/list.js | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/web/src/js/ducks/utils/list.js b/web/src/js/ducks/utils/list.js index a5ce7250..a830fe99 100644 --- a/web/src/js/ducks/utils/list.js +++ b/web/src/js/ducks/utils/list.js @@ -62,8 +62,9 @@ export default function makeList(actionType, fetchURL) { itemIndex = state.indexOf[action.item.id] list[itemIndex] = action.item return { - ...defaultState, - list + ...state, + list, + byId: {...state.byId, [action.item.id]: action.item}, } case REMOVE: @@ -71,7 +72,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 +80,7 @@ export default function makeList(actionType, fetchURL) { case REQUEST_LIST: return { - ...defaultState, + ...state, isFetching: true } |