diff options
| author | Brian C. Lindner <cslindner@gmail.com> | 2020-05-31 14:34:34 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-31 20:34:34 +0200 |
| commit | 64154c5161d4d5c82877fba549d72068cc7f9e16 (patch) | |
| tree | 7925969e7f7690f31365a997c4670046d50ba611 /app/javascript/mastodon/features/compose/components | |
| parent | cc650bc023e00d07c5796b7602d86597bb437f45 (diff) | |
| download | mastodon-64154c5161d4d5c82877fba549d72068cc7f9e16.tar mastodon-64154c5161d4d5c82877fba549d72068cc7f9e16.tar.gz mastodon-64154c5161d4d5c82877fba549d72068cc7f9e16.tar.bz2 mastodon-64154c5161d4d5c82877fba549d72068cc7f9e16.zip | |
Allow Ctrl-click to keep EmojiPicker window open (#13896)
Diffstat (limited to 'app/javascript/mastodon/features/compose/components')
| -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); } |