about summary refs log tree commit diff
path: root/app/javascript
diff options
context:
space:
mode:
authorThibG <thib@sitedethib.com>2018-10-17 16:56:16 +0200
committerEugen Rochko <eugen@zeonfederated.com>2018-10-17 16:56:16 +0200
commitadb06baef6d7cb1e3c051c621ba454aec82edeef (patch)
treed242ceff8a65aaf9780f7d40b5e04a1f2eff4921 /app/javascript
parent7085b21f70ee0640e034c5884a93da9b015b4ab5 (diff)
Handle global hotkeys even when no element has focus (#8998)
This fixes hotkeys not working when pressing the column
“back” button, for instance.
Diffstat (limited to 'app/javascript')
-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 fb6f675f4..662375a76 100644
--- a/app/javascript/mastodon/features/ui/index.js
+++ b/app/javascript/mastodon/features/ui/index.js
@@ -460,7 +460,7 @@ class UI extends React.PureComponent {
     };
 
     return (
-      <HotKeys keyMap={keyMap} handlers={handlers} ref={this.setHotkeysRef}>
+      <HotKeys keyMap={keyMap} handlers={handlers} ref={this.setHotkeysRef} attach={window} focused>
         <div className={classNames('ui', { 'is-composing': isComposing })} ref={this.setRef} style={{ pointerEvents: dropdownMenuIsOpen ? 'none' : null }}>
           <TabsBar />