aboutsummaryrefslogtreecommitdiffstats
path: root/web
diff options
context:
space:
mode:
authorClemens <cle1000.cb@gmail.com>2016-08-22 08:57:55 +0200
committerClemens <cle1000.cb@gmail.com>2016-08-22 08:57:55 +0200
commiteddc4243791c2c2b1a91c1d8ae49b830206bc6df (patch)
tree1fee6aac160ec4c69326003f9ca06dc67a018945 /web
parentd0b420f383d1d670c25ee90216ac0045fba3ebc0 (diff)
downloadmitmproxy-eddc4243791c2c2b1a91c1d8ae49b830206bc6df.tar.gz
mitmproxy-eddc4243791c2c2b1a91c1d8ae49b830206bc6df.tar.bz2
mitmproxy-eddc4243791c2c2b1a91c1d8ae49b830206bc6df.zip
fix dropdown css, add new selection after delete
Diffstat (limited to 'web')
-rw-r--r--web/src/css/dropdown.less2
-rw-r--r--web/src/js/ducks/flows.js11
2 files changed, 10 insertions, 3 deletions
diff --git a/web/src/css/dropdown.less b/web/src/css/dropdown.less
index 663373b3..ba8442df 100644
--- a/web/src/css/dropdown.less
+++ b/web/src/css/dropdown.less
@@ -1,4 +1,4 @@
-hr .divider {
+hr.divider {
margin-top: 5px;
margin-bottom: 5px;
}
diff --git a/web/src/js/ducks/flows.js b/web/src/js/ducks/flows.js
index 913d0881..404db0d1 100644
--- a/web/src/js/ducks/flows.js
+++ b/web/src/js/ducks/flows.js
@@ -1,5 +1,6 @@
import { fetchApi } from '../utils'
import reduceList, * as listActions from './utils/list'
+import { selectRelative } from './flowView'
import * as msgQueueActions from './msgQueue'
import * as websocketActions from './websocket'
@@ -210,8 +211,14 @@ export function updateFlow(item) {
* @private
*/
export function removeFlow(id) {
- return (dispatch) => {
- dispatch(select())
+ return (dispatch, getState) => {
+ let currentIndex = getState().flowView.indexOf[getState().flows.selected[0]]
+ let maxIndex = getState().flowView.data.length - 1
+ let deleteLastEntry = maxIndex == 0
+ if (deleteLastEntry)
+ dispatch(select())
+ else
+ dispatch(selectRelative(currentIndex == maxIndex ? -1 : 1) )
dispatch({ type: REMOVE, id })
}
}