Browse Source

Fix #5295 - Order custom emoji lexicographically (#5297)

pull/4/head
Eugen Rochko 6 years ago
committed by GitHub
parent
commit
4bb3e4eeba
1 changed files with 16 additions and 1 deletions
  1. +16
    -1
      app/javascript/mastodon/features/compose/containers/emoji_picker_dropdown_container.js

+ 16
- 1
app/javascript/mastodon/features/compose/containers/emoji_picker_dropdown_container.js View File

@ -18,8 +18,23 @@ const getFrequentlyUsedEmojis = createSelector([
.toArray()
);
const getCustomEmojis = createSelector([
state => state.get('custom_emojis'),
], emojis => emojis.sort((a, b) => {
const aShort = a.get('shortcode').toLowerCase();
const bShort = b.get('shortcode').toLowerCase();
if (aShort < bShort) {
return -1;
} else if (aShort > bShort ) {
return 1;
} else {
return 0;
}
}));
const mapStateToProps = state => ({
custom_emojis: state.get('custom_emojis'),
custom_emojis: getCustomEmojis(state),
autoPlay: state.getIn(['meta', 'auto_play_gif']),
skinTone: state.getIn(['settings', 'skinTone']),
frequentlyUsedEmojis: getFrequentlyUsedEmojis(state),

Loading…
Cancel
Save