diff options
author | Takeshi Umeda <noel.yoshiba@gmail.com> | 2020-06-20 20:30:40 +0900 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-06-20 13:30:40 +0200 |
commit | 434a6d0b15ff413c6e4d7e0c3763af6429ad25b6 (patch) | |
tree | 65b190c0594b2f9aaa5e5ee4fbc48e3498df5c72 /app/javascript | |
parent | cb3c6d17804da67d3c0ff233a9ca1c1902f6926f (diff) |
Fix modifier key to keep the EmojiPicker on macOS (#14096)
Diffstat (limited to 'app/javascript')
-rw-r--r-- | app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.js b/app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.js index a6186010b..360a7af6a 100644 --- a/app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.js +++ b/app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.js @@ -203,7 +203,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); |