about summary refs log tree commit diff
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2017-10-11 16:31:07 +0200
committerGitHub <noreply@github.com>2017-10-11 16:31:07 +0200
commit476e79b8e340c9103352a0799e102e4aca1a5593 (patch)
treea36548f78af2b4c9d640d2beafd7a5fe36cc7b8e
parent19d3317a69bebf5239e7a4ef157be5f19b2a351b (diff)
Fully disable hotkeys when input element is focused (#5324)
Because alt+n is a way to enter some kinda letter on some keyboard
-rw-r--r--app/javascript/mastodon/features/ui/index.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/javascript/mastodon/features/ui/index.js b/app/javascript/mastodon/features/ui/index.js
index 108b28422..70e451373 100644
--- a/app/javascript/mastodon/features/ui/index.js
+++ b/app/javascript/mastodon/features/ui/index.js
@@ -186,7 +186,7 @@ export default class UI extends React.Component {
 
   componentDidMount () {
     this.hotkeys.__mousetrap__.stopCallback = (e, element) => {
-      return !(e.altKey || e.ctrlKey || e.metaKey) && ['TEXTAREA', 'SELECT', 'INPUT'].includes(element.tagName);
+      return ['TEXTAREA', 'SELECT', 'INPUT'].includes(element.tagName);
     };
   }