diff options
author | Joram Wilander <jwawilander@gmail.com> | 2017-06-21 10:38:19 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-06-21 10:38:19 -0400 |
commit | 6bfb7ea3a91187a3f95f22b16933530eb784e06f (patch) | |
tree | 40af3e54ffb160c886c0f10db31ce13e135ab015 /webapp/components/suggestion | |
parent | f80003a975d40741803fee576f57f2700a95656f (diff) | |
download | chat-6bfb7ea3a91187a3f95f22b16933530eb784e06f.tar.gz chat-6bfb7ea3a91187a3f95f22b16933530eb784e06f.tar.bz2 chat-6bfb7ea3a91187a3f95f22b16933530eb784e06f.zip |
Fix JS error when hovering over reactions (#6710)
* Fix JS error when hovering over reactions
* Fix autocomplete for custom emojis
* Update to latest mattermost-redux
Diffstat (limited to 'webapp/components/suggestion')
-rw-r--r-- | webapp/components/suggestion/emoticon_provider.jsx | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/webapp/components/suggestion/emoticon_provider.jsx b/webapp/components/suggestion/emoticon_provider.jsx index 0a7f1ff8a..1de35dc20 100644 --- a/webapp/components/suggestion/emoticon_provider.jsx +++ b/webapp/components/suggestion/emoticon_provider.jsx @@ -3,12 +3,15 @@ import React from 'react'; -import EmojiStore from 'stores/emoji_store.jsx'; +import {default as EmojiStore, EmojiMap} from 'stores/emoji_store.jsx'; import * as Emoticons from 'utils/emoticons.jsx'; import SuggestionStore from 'stores/suggestion_store.jsx'; import Suggestion from './suggestion.jsx'; +import store from 'stores/redux_store.jsx'; +import {getCustomEmojisByName} from 'mattermost-redux/selectors/entities/emojis'; + const MIN_EMOTICON_LENGTH = 2; class EmoticonSuggestion extends Suggestion { @@ -71,8 +74,10 @@ export default class EmoticonProvider { } } + const emojis = new EmojiMap(getCustomEmojisByName(store.getState())); + // check for named emoji - for (const [name, emoji] of EmojiStore.getEmojis()) { + for (const [name, emoji] of emojis) { if (emoji.aliases) { // This is a system emoji so it may have multiple names for (const alias of emoji.aliases) { |