Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Fix custom emoji in emoji picker, persist skin tone (#5258)

Browse source
This commit is contained in:
Eugen Rochko 2017-10-07 19:02:30 +02:00 • committed by GitHub
parent 967e70663f
commit d2dee6ea43
4 changed files with 66 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

10
app/javascript/mastodon/features/compose/containers/emoji_picker_dropdown_container.js
View file

@ -1,9 +1,17 @@
import { connect } from 'react-redux';
import EmojiPickerDropdown from '../components/emoji_picker_dropdown';
import { changeSetting } from '../../../actions/settings';
const mapStateToProps = state => ({
custom_emojis: state.get('custom_emojis'),
autoPlay: state.getIn(['meta', 'auto_play_gif']),
skinTone: state.getIn(['settings', 'skinTone']),
});
export default connect(mapStateToProps)(EmojiPickerDropdown);
const mapDispatchToProps = dispatch => ({
onSkinTone: skinTone => {
dispatch(changeSetting(['skinTone'], skinTone));
},
});
export default connect(mapStateToProps, mapDispatchToProps)(EmojiPickerDropdown);