diff options
| author | ThibG <thib@sitedethib.com> | 2020-06-24 17:06:26 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-24 17:06:26 +0200 |
| commit | 8f4aff9b6fe638b26b9d0bf0fe4151c2cc214d6d (patch) | |
| tree | 89b283a87f3ff82b24148636594c0837aa34b322 /app/javascript/flavours/glitch/features | |
| parent | 5d12b63e79953a7596ae473706985b774d4e51a6 (diff) | |
| parent | 72d193654b9369b43090a4de2e197c21c30f3f31 (diff) | |
Merge pull request #1361 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/javascript/flavours/glitch/features')
| -rw-r--r-- | app/javascript/flavours/glitch/features/emoji_picker/index.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/javascript/flavours/glitch/features/emoji_picker/index.js b/app/javascript/flavours/glitch/features/emoji_picker/index.js index 14e5cb94a..d0d9714a8 100644 --- a/app/javascript/flavours/glitch/features/emoji_picker/index.js +++ b/app/javascript/flavours/glitch/features/emoji_picker/index.js @@ -283,7 +283,7 @@ class EmojiPickerMenu extends React.PureComponent { if (!emoji.native) { emoji.native = emoji.colons; } - if (!event.ctrlKey) { + if (!(event.ctrlKey || event.metaKey)) { this.props.onClose(); } this.props.onPick(emoji); |