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_comment.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_comment.jsx')
-rw-r--r-- | webapp/components/rhs_comment.jsx | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/webapp/components/rhs_comment.jsx b/webapp/components/rhs_comment.jsx index 202be9748..568d85304 100644 --- a/webapp/components/rhs_comment.jsx +++ b/webapp/components/rhs_comment.jsx @@ -11,7 +11,6 @@ import FailedPostOptions from 'components/post_view/failed_post_options'; import DotMenu from 'components/dot_menu'; import EmojiPickerOverlay from 'components/emoji_picker/emoji_picker_overlay.jsx'; -import * as GlobalActions from 'actions/global_actions.jsx'; import {addReaction} from 'actions/post_actions.jsx'; import TeamStore from 'stores/team_store.jsx'; @@ -27,6 +26,19 @@ import {Link} from 'react-router/es6'; import {FormattedMessage} from 'react-intl'; export default class RhsComment extends React.Component { + static propTypes = { + post: PropTypes.object, + lastPostCount: PropTypes.number, + user: PropTypes.object.isRequired, + currentUser: PropTypes.object.isRequired, + compactDisplay: PropTypes.bool, + useMilitaryTime: PropTypes.bool.isRequired, + isFlagged: PropTypes.bool, + status: PropTypes.string, + isBusy: PropTypes.bool, + removePost: PropTypes.func.isRequired + }; + constructor(props) { super(props); @@ -56,7 +68,7 @@ export default class RhsComment extends React.Component { } removePost() { - GlobalActions.emitRemovePost(this.props.post); + this.props.removePost(this.props.post); } createRemovePostButton() { @@ -333,9 +345,10 @@ export default class RhsComment 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='#' @@ -436,16 +449,3 @@ export default class RhsComment extends React.Component { ); } } - -RhsComment.propTypes = { - post: PropTypes.object, - lastPostCount: PropTypes.number, - user: PropTypes.object.isRequired, - currentUser: PropTypes.object.isRequired, - compactDisplay: PropTypes.bool, - useMilitaryTime: PropTypes.bool.isRequired, - isFlagged: PropTypes.bool, - status: PropTypes.string, - isBusy: PropTypes.bool, - getPostList: PropTypes.func.isRequired -}; |