diff options
author | Joram Wilander <jwawilander@gmail.com> | 2016-02-01 09:54:04 -0500 |
---|---|---|
committer | Joram Wilander <jwawilander@gmail.com> | 2016-02-01 09:54:04 -0500 |
commit | a6d2c2c2d943a88890087ccff3282481f1e44114 (patch) | |
tree | 532fee324f0f2de66bdd40fe1d61bff6a35f4753 /web/react/components/post_info.jsx | |
parent | caf957312b4e71151319ebb7395ddac8fcac85fc (diff) | |
parent | 4abe6037bbc57bba77b0ceb9014595e37f9d1710 (diff) | |
download | chat-a6d2c2c2d943a88890087ccff3282481f1e44114.tar.gz chat-a6d2c2c2d943a88890087ccff3282481f1e44114.tar.bz2 chat-a6d2c2c2d943a88890087ccff3282481f1e44114.zip |
Merge pull request #2039 from asaadmahmoodspin/ui-improvements
Fixing system console and changing swapping icon with reply icon
Diffstat (limited to 'web/react/components/post_info.jsx')
-rw-r--r-- | web/react/components/post_info.jsx | 41 |
1 files changed, 18 insertions, 23 deletions
diff --git a/web/react/components/post_info.jsx b/web/react/components/post_info.jsx index 73b47024c..2bff675a9 100644 --- a/web/react/components/post_info.jsx +++ b/web/react/components/post_info.jsx @@ -22,26 +22,6 @@ export default class PostInfo extends React.Component { this.handlePermalinkCopy = this.handlePermalinkCopy.bind(this); } - createReplyLink() { - if (this.props.allowReply === 'true') { - var hideReply = ''; - - if (this.props.commentCount >= 1) { - hideReply = ' post__reply--hide'; - } - - return ( - <div className={'post__reply' + hideReply}> - <a - onClick={this.props.handleCommentClick} - href='#' - > - <span dangerouslySetInnerHTML={{__html: Constants.REPLY_ICON}}/> - </a> - </div> - ); - } - } createDropdown() { var post = this.props.post; var isOwner = UserStore.getCurrentId() === post.user_id; @@ -62,6 +42,23 @@ export default class PostInfo extends React.Component { dataComments = this.props.commentCount; } + if (this.props.allowReply === 'true') { + dropdownContents.push( + <li + key='replyLink' + role='presentation' + > + <a + className='link__reply theme' + href='#' + onClick={this.props.handleCommentClick} + > + {'Reply'} + </a> + </li> + ); + } + dropdownContents.push( <li key='copyLink' @@ -176,7 +173,7 @@ export default class PostInfo extends React.Component { > <span className='comment-icon' - dangerouslySetInnerHTML={{__html: Constants.COMMENT_ICON}} + dangerouslySetInnerHTML={{__html: Constants.REPLY_ICON}} /> {commentCountText} </a> @@ -184,7 +181,6 @@ export default class PostInfo extends React.Component { } var dropdown = this.createDropdown(); - var replyLink = this.createReplyLink(); const permalink = TeamStore.getCurrentTeamUrl() + '/pl/' + post.id; const copyButtonText = this.state.copiedLink ? (<div>{'Copy '}<i className='fa fa-check'/></div>) : 'Copy'; @@ -227,7 +223,6 @@ export default class PostInfo extends React.Component { /> </li> <li className='col col__reply'> - {replyLink} <div className='dropdown' ref='dotMenu' |