diff options
author | David Lu <david.lu@hotmail.com> | 2016-06-02 15:45:38 -0700 |
---|---|---|
committer | enahum <nahumhbl@gmail.com> | 2016-06-02 19:45:38 -0300 |
commit | 9509398d3270c1b6056ca78ddc9913273585c0af (patch) | |
tree | 66b4aca294e91817a0cae9929456c63dd64b4cc6 /webapp/components/suggestion/suggestion_box.jsx | |
parent | 2f7540e174dce808dc642c42d85151238c352e5d (diff) | |
download | chat-9509398d3270c1b6056ca78ddc9913273585c0af.tar.gz chat-9509398d3270c1b6056ca78ddc9913273585c0af.tar.bz2 chat-9509398d3270c1b6056ca78ddc9913273585c0af.zip |
PLT-2962 Added channel switcher modal (#3216)
* Added channel switcher modal
* Fixed typos
* Added handling for duplicate channels
Diffstat (limited to 'webapp/components/suggestion/suggestion_box.jsx')
-rw-r--r-- | webapp/components/suggestion/suggestion_box.jsx | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/webapp/components/suggestion/suggestion_box.jsx b/webapp/components/suggestion/suggestion_box.jsx index f81cc6765..0ed9449ed 100644 --- a/webapp/components/suggestion/suggestion_box.jsx +++ b/webapp/components/suggestion/suggestion_box.jsx @@ -176,7 +176,10 @@ export default class SuggestionBox extends React.Component { return ( <div> {textbox} - <SuggestionListComponent suggestionId={this.suggestionId}/> + <SuggestionListComponent + suggestionId={this.suggestionId} + location={this.props.listStyle} + /> </div> ); } @@ -197,7 +200,8 @@ export default class SuggestionBox extends React.Component { } SuggestionBox.defaultProps = { - type: 'input' + type: 'input', + listStyle: 'top' }; SuggestionBox.propTypes = { @@ -206,6 +210,7 @@ SuggestionBox.propTypes = { value: React.PropTypes.string.isRequired, onUserInput: React.PropTypes.func, providers: React.PropTypes.arrayOf(React.PropTypes.object), + listStyle: React.PropTypes.string, // explicitly name any input event handlers we override and need to manually call onChange: React.PropTypes.func, |