aboutsummaryrefslogtreecommitdiff
path: root/app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.js
diff options
context:
space:
mode:
authorNolan Lawson <nolan@nolanlawson.com>2017-10-31 14:58:07 -0700
committerYamagishi Kazutoshi <ykzts@desire.sh>2017-11-01 06:58:07 +0900
commit60f962eedcb8adb9ea2856cda270117ec41716d7 (patch)
tree45038a74581a36b4e8decfa60fadfb44799dcfde /app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.js
parent47d56438dafb4cf86e65379c9d7b818bb4236a04 (diff)
downloadmastodon-60f962eedcb8adb9ea2856cda270117ec41716d7.tar
mastodon-60f962eedcb8adb9ea2856cda270117ec41716d7.tar.gz
mastodon-60f962eedcb8adb9ea2856cda270117ec41716d7.tar.bz2
mastodon-60f962eedcb8adb9ea2856cda270117ec41716d7.zip
Refactor initial state: auto_play_gif (#5576)
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.js9
1 files changed, 3 insertions, 6 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 dffa04ff0..dc8fc02ba 100644
--- a/app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.js
+++ b/app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.js
@@ -157,7 +157,6 @@ class EmojiPickerMenu extends React.PureComponent {
intl: PropTypes.object.isRequired,
skinTone: PropTypes.number.isRequired,
onSkinTone: PropTypes.func.isRequired,
- autoPlay: PropTypes.bool,
};
static defaultProps = {
@@ -235,7 +234,7 @@ class EmojiPickerMenu extends React.PureComponent {
}
render () {
- const { loading, style, intl, custom_emojis, autoPlay, skinTone, frequentlyUsedEmojis } = this.props;
+ const { loading, style, intl, custom_emojis, skinTone, frequentlyUsedEmojis } = this.props;
if (loading) {
return <div style={{ width: 299 }} />;
@@ -250,7 +249,7 @@ class EmojiPickerMenu extends React.PureComponent {
perLine={8}
emojiSize={22}
sheetSize={32}
- custom={buildCustomEmojis(custom_emojis, autoPlay)}
+ custom={buildCustomEmojis(custom_emojis)}
color=''
emoji=''
set='twitter'
@@ -284,7 +283,6 @@ export default class EmojiPickerDropdown extends React.PureComponent {
static propTypes = {
custom_emojis: ImmutablePropTypes.list,
frequentlyUsedEmojis: PropTypes.arrayOf(PropTypes.string),
- autoPlay: PropTypes.bool,
intl: PropTypes.object.isRequired,
onPickEmoji: PropTypes.func.isRequired,
onSkinTone: PropTypes.func.isRequired,
@@ -346,7 +344,7 @@ export default class EmojiPickerDropdown extends React.PureComponent {
}
render () {
- const { intl, onPickEmoji, autoPlay, onSkinTone, skinTone, frequentlyUsedEmojis } = this.props;
+ const { intl, onPickEmoji, onSkinTone, skinTone, frequentlyUsedEmojis } = this.props;
const title = intl.formatMessage(messages.emoji);
const { active, loading } = this.state;
@@ -366,7 +364,6 @@ export default class EmojiPickerDropdown extends React.PureComponent {
loading={loading}
onClose={this.onHideDropdown}
onPick={onPickEmoji}
- autoPlay={autoPlay}
onSkinTone={onSkinTone}
skinTone={skinTone}
frequentlyUsedEmojis={frequentlyUsedEmojis}