diff options
author | Thibaut Girka <thib@sitedethib.com> | 2020-06-01 18:21:43 +0200 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2020-06-01 18:21:43 +0200 |
commit | 89de02f7aa739b4f671c93f8538e17b2189f111f (patch) | |
tree | ff16d5cf3225f0155879dd22c92adb95c830ab5c /app/javascript/mastodon/features/compose | |
parent | 1f94f4009e5b072f8b508b1bf1a046ea034de7c1 (diff) | |
parent | 51ff679b9deb559ddc53cdfa6265b996f6c7fd5e (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Diffstat (limited to 'app/javascript/mastodon/features/compose')
-rw-r--r-- | app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.js | 7 |
1 files changed, 4 insertions, 3 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 582bb0d39..a6186010b 100644 --- a/app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.js +++ b/app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.js @@ -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); } |