diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2017-07-20 18:01:53 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-20 18:01:53 +0200 |
| commit | e1d0bc6de975c377cb42022209ea1b5bce515433 (patch) | |
| tree | 4f52c967b9312dd0c08e3f88f51b93dd2849dffe /web/src/js/ducks/ui/keyboard.js | |
| parent | 8526ca9e175af4a903348c39928535ae10f7543d (diff) | |
| parent | cb73658dd43e01bdedd84aa31601887b19c106ca (diff) | |
| download | mitmproxy-e1d0bc6de975c377cb42022209ea1b5bce515433.tar.gz mitmproxy-e1d0bc6de975c377cb42022209ea1b5bce515433.tar.bz2 mitmproxy-e1d0bc6de975c377cb42022209ea1b5bce515433.zip | |
Merge pull request #2430 from MatthewShao/mitmweb-options
[web] [WIP] Mitmweb options
Diffstat (limited to 'web/src/js/ducks/ui/keyboard.js')
| -rw-r--r-- | web/src/js/ducks/ui/keyboard.js | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/web/src/js/ducks/ui/keyboard.js b/web/src/js/ducks/ui/keyboard.js index 0e3491fa..e3f8c33c 100644 --- a/web/src/js/ducks/ui/keyboard.js +++ b/web/src/js/ducks/ui/keyboard.js @@ -1,6 +1,7 @@ import { Key } from "../../utils" import { selectTab } from "./flow" import * as flowsActions from "../flows" +import * as modalActions from "./modal" export function onKeyDown(e) { @@ -46,7 +47,11 @@ export function onKeyDown(e) { break case Key.ESC: - dispatch(flowsActions.select(null)) + if(getState().ui.modal.activeModal){ + dispatch(modalActions.hideModal()) + } else { + dispatch(flowsActions.select(null)) + } break case Key.LEFT: { |