diff options
author | Eugen Rochko <eugen@zeonfederated.com> | 2017-10-07 02:38:52 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-10-07 02:38:52 +0200 |
commit | 45682f876d4257c61b1d42469d04dd53fc4f8189 (patch) | |
tree | 38acd9df3c58d3ab0fdd8acd44065bc5b914be40 /app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.js | |
parent | 4413d81d7f7b290f7e69ce3397ca969ea1c96622 (diff) |
Make auto-play GIFs preference affect custom emojis in web UI (#5254)
Diffstat (limited to 'app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.js')
-rw-r--r-- | app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.js | 5 |
1 files changed, 4 insertions, 1 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 2bea5e2b1..210721d9c 100644 --- a/app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.js +++ b/app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.js @@ -264,6 +264,7 @@ export default class EmojiPickerDropdown extends React.PureComponent { static propTypes = { custom_emojis: ImmutablePropTypes.list, + autoPlay: PropTypes.bool, intl: PropTypes.object.isRequired, onPickEmoji: PropTypes.func.isRequired, }; @@ -278,6 +279,8 @@ export default class EmojiPickerDropdown extends React.PureComponent { } onShowDropdown = () => { + const { autoPlay } = this.props; + this.setState({ active: true }); if (!EmojiPicker) { @@ -287,7 +290,7 @@ export default class EmojiPickerDropdown extends React.PureComponent { EmojiPicker = EmojiMart.Picker; Emoji = EmojiMart.Emoji; // populate custom emoji in search - EmojiMart.emojiIndex.search('', { custom: buildCustomEmojis(this.props.custom_emojis) }); + EmojiMart.emojiIndex.search('', { custom: buildCustomEmojis(this.props.custom_emojis, autoPlay) }); this.setState({ loading: false }); }).catch(() => { this.setState({ loading: false }); |