]> cat aescling's git repositories - mastodon.git/commitdiff
[Glitch] Fix modifier key to keep the EmojiPicker on macOS
authorTakeshi Umeda <noel.yoshiba@gmail.com>
Sat, 20 Jun 2020 11:30:40 +0000 (20:30 +0900)
committerThibaut Girka <thib@sitedethib.com>
Wed, 24 Jun 2020 13:56:43 +0000 (15:56 +0200)
Port 434a6d0b15ff413c6e4d7e0c3763af6429ad25b6 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
app/javascript/flavours/glitch/features/emoji_picker/index.js

index 14e5cb94a786499d74c0e913118f253880a21615..d0d9714a8b2274a73c1f8f7b732f8b5f4479b6ce 100644 (file)
@@ -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);