aboutsummaryrefslogtreecommitdiffstats
path: root/web/src
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2019-11-15 18:10:42 +0100
committerMaximilian Hils <git@maximilianhils.com>2019-11-15 18:10:42 +0100
commit0873566ff05c02be063f3aa15adecb725342119c (patch)
treea6dcddf0f0c08c9ff9cdd89e1f95196af2ff5a6a /web/src
parentd852f292c9a45de7f45cc8537f2aef217259017e (diff)
parentfbbbbb678e77e3cff5ab35b1fd55e85e875ed3f5 (diff)
downloadmitmproxy-0873566ff05c02be063f3aa15adecb725342119c.tar.gz
mitmproxy-0873566ff05c02be063f3aa15adecb725342119c.tar.bz2
mitmproxy-0873566ff05c02be063f3aa15adecb725342119c.zip
Merge remote-tracking branch 'origin/master' into pr-3448
Diffstat (limited to 'web/src')
-rw-r--r--web/src/js/ducks/ui/keyboard.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/web/src/js/ducks/ui/keyboard.js b/web/src/js/ducks/ui/keyboard.js
index ed4dbba5..007d24db 100644
--- a/web/src/js/ducks/ui/keyboard.js
+++ b/web/src/js/ducks/ui/keyboard.js
@@ -6,7 +6,7 @@ import * as modalActions from "./modal"
export function onKeyDown(e) {
//console.debug("onKeyDown", e)
- if (e.ctrlKey) {
+ if (e.ctrlKey || e.metaKey) {
return () => {
}
}