autonomic-cooperative/hometown
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge tag 'v3.2.0' into hometown-dev

Browse Source
This commit is contained in:
Darius Kazemi
2020-08-11 13:56:04 -07:00
parent 65dc8812c9 93dd413a47
commit 52cb64a183
676 changed files with 20549 additions and 6955 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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