cincodenada
/
mastodon
forked from cybrespace/mastodon
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix modifier key to keep the EmojiPicker on macOS (#14096)

This commit is contained in:
Takeshi Umeda 2020-06-20 20:30:40 +09:00 committed by GitHub
parent cb3c6d1780
commit 434a6d0b15
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.js
View File

@ -203,7 +203,7 @@ class EmojiPickerMenu extends React.PureComponent {
if (!emoji.native) { if (!emoji.native) {
emoji.native = emoji.colons; emoji.native = emoji.colons;
} }
if (!event.ctrlKey) { if (!(event.ctrlKey || event.metaKey)) {
this.props.onClose(); this.props.onClose();
} }
this.props.onPick(emoji); this.props.onPick(emoji);