diff options
author | Harrison Healey <harrisonmhealey@gmail.com> | 2015-12-03 09:12:33 -0500 |
---|---|---|
committer | Harrison Healey <harrisonmhealey@gmail.com> | 2015-12-03 09:12:33 -0500 |
commit | 61f90860a875cbf019570dfbb06ba716a7994fc3 (patch) | |
tree | a55f2a6deb773d4c08aed73427bdb2dd1604a70e /web/react/components/textbox.jsx | |
parent | ffd5d554659816ac0fd24f1470fe7ee6dfe7ba50 (diff) | |
parent | 027c4c88f01210a967dc1f80919eb33d8da67737 (diff) | |
download | chat-61f90860a875cbf019570dfbb06ba716a7994fc3.tar.gz chat-61f90860a875cbf019570dfbb06ba716a7994fc3.tar.bz2 chat-61f90860a875cbf019570dfbb06ba716a7994fc3.zip |
Merge pull request #1582 from hmhealey/emojiautocomplete
Emoji autocomplete
Diffstat (limited to 'web/react/components/textbox.jsx')
-rw-r--r-- | web/react/components/textbox.jsx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/web/react/components/textbox.jsx b/web/react/components/textbox.jsx index 107e65f57..b29f304ab 100644 --- a/web/react/components/textbox.jsx +++ b/web/react/components/textbox.jsx @@ -3,6 +3,7 @@ import AtMentionProvider from './suggestion/at_mention_provider.jsx'; import CommandProvider from './suggestion/command_provider.jsx'; +import EmoticonProvider from './suggestion/emoticon_provider.jsx'; import SuggestionList from './suggestion/suggestion_list.jsx'; import SuggestionBox from './suggestion/suggestion_box.jsx'; import ErrorStore from '../stores/error_store.jsx'; @@ -29,7 +30,7 @@ export default class Textbox extends React.Component { connection: '' }; - this.suggestionProviders = [new AtMentionProvider()]; + this.suggestionProviders = [new AtMentionProvider(), new EmoticonProvider()]; if (props.supportsCommands) { this.suggestionProviders.push(new CommandProvider()); } |