diff options
| author | Takeshi Umeda <noel.yoshiba@gmail.com> | 2020-06-20 20:30:40 +0900 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2020-06-24 15:56:43 +0200 |
| commit | 83bc9f68af130db3b5c41cab5f76443348a96601 (patch) | |
| tree | 6aed5f996b21b7eb2484464c4d49100563ce7e54 /app/javascript/flavours/glitch/features/emoji_picker | |
| parent | 51922d7ffa0e876493e33411e7b3d7d7f8b51d44 (diff) | |
[Glitch] Fix modifier key to keep the EmojiPicker on macOS
Port 434a6d0b15ff413c6e4d7e0c3763af6429ad25b6 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
Diffstat (limited to 'app/javascript/flavours/glitch/features/emoji_picker')
| -rw-r--r-- | app/javascript/flavours/glitch/features/emoji_picker/index.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/javascript/flavours/glitch/features/emoji_picker/index.js b/app/javascript/flavours/glitch/features/emoji_picker/index.js index 14e5cb94a..d0d9714a8 100644 --- a/app/javascript/flavours/glitch/features/emoji_picker/index.js +++ b/app/javascript/flavours/glitch/features/emoji_picker/index.js @@ -283,7 +283,7 @@ class EmojiPickerMenu extends React.PureComponent { if (!emoji.native) { emoji.native = emoji.colons; } - if (!event.ctrlKey) { + if (!(event.ctrlKey || event.metaKey)) { this.props.onClose(); } this.props.onPick(emoji); |