Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Merge branch 'master' into glitch-soc/merge-upstream

Browse source
This commit is contained in:
Thibaut Girka 2020-06-01 18:21:43 +02:00
commit 89de02f7aa
6 changed files with 39 additions and 15 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) {
this.props.onClose();
}
this.props.onPick(emoji);
}