diff options
| author | Christopher Speller <crspeller@gmail.com> | 2017-07-18 15:45:23 -0700 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2017-07-18 15:45:23 -0700 |
| commit | 97f34e483b0fa8b2a8cfe75b72168cfa38cc9d80 (patch) | |
| tree | ec2d68077dd2b12de3173871622f3ec2a2b61d35 /webapp/components/rhs_root_post.jsx | |
| parent | 21a3219b9b1df033635631afa751742bd4c56ea0 (diff) | |
| parent | a350f4dc0754e1aeabb64bd712ce05f7c59cfa60 (diff) | |
| download | chat-97f34e483b0fa8b2a8cfe75b72168cfa38cc9d80.tar.gz chat-97f34e483b0fa8b2a8cfe75b72168cfa38cc9d80.tar.bz2 chat-97f34e483b0fa8b2a8cfe75b72168cfa38cc9d80.zip | |
Merge branch 'release-4.0'
Diffstat (limited to 'webapp/components/rhs_root_post.jsx')
| -rw-r--r-- | webapp/components/rhs_root_post.jsx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/webapp/components/rhs_root_post.jsx b/webapp/components/rhs_root_post.jsx index 352de0c67..fa72da167 100644 --- a/webapp/components/rhs_root_post.jsx +++ b/webapp/components/rhs_root_post.jsx @@ -38,8 +38,7 @@ export default class RhsRootPost extends React.Component { isFlagged: PropTypes.bool, status: PropTypes.string, previewCollapsed: PropTypes.string, - isBusy: PropTypes.bool, - getPostList: PropTypes.func.isRequired + isBusy: PropTypes.bool } static defaultProps = { @@ -226,9 +225,10 @@ export default class RhsRootPost extends React.Component { show={this.state.showEmojiPicker} onHide={this.toggleEmojiPicker} target={() => this.refs.dotMenu} - container={this.props.getPostList} onEmojiClick={this.reactEmojiClick} rightOffset={15} + spaceRequiredAbove={342} + spaceRequiredBelow={342} /> <a href='#' |