diff options
author | JoramWilander <jwawilander@gmail.com> | 2015-08-14 11:36:51 -0400 |
---|---|---|
committer | JoramWilander <jwawilander@gmail.com> | 2015-08-18 08:59:27 -0400 |
commit | 76d54190a0abb4c03ca7207ae50eff02190ba89a (patch) | |
tree | 9336a9872389f0e88122024bc8a915858db37de6 /web | |
parent | d3743550b7b89f2b1444a2368378102f5493668e (diff) | |
download | chat-76d54190a0abb4c03ca7207ae50eff02190ba89a.tar.gz chat-76d54190a0abb4c03ca7207ae50eff02190ba89a.tar.bz2 chat-76d54190a0abb4c03ca7207ae50eff02190ba89a.zip |
reformatting and minor refactoring of post_*.jsx to match style guide
Diffstat (limited to 'web')
-rw-r--r-- | web/react/components/post.jsx | 4 | ||||
-rw-r--r-- | web/react/components/post_body.jsx | 12 | ||||
-rw-r--r-- | web/react/components/post_info.jsx | 84 |
3 files changed, 62 insertions, 38 deletions
diff --git a/web/react/components/post.jsx b/web/react/components/post.jsx index 4b66e175c..b798dc7ca 100644 --- a/web/react/components/post.jsx +++ b/web/react/components/post.jsx @@ -74,9 +74,9 @@ module.exports = React.createClass({ var parentPost = this.props.parentPost; var posts = this.props.posts; - var type = "Post"; + var type = 'Post'; if (post.root_id && post.root_id.length > 0) { - type = "Comment"; + type = 'Comment'; } var commentCount = 0; diff --git a/web/react/components/post_body.jsx b/web/react/components/post_body.jsx index 7abf38838..13722857e 100644 --- a/web/react/components/post_body.jsx +++ b/web/react/components/post_body.jsx @@ -31,9 +31,9 @@ module.exports = React.createClass({ var name = "..."; if (profile != null) { if (profile.username.slice(-1) === 's') { - apostrophe = "'"; + apostrophe = '\''; } else { - apostrophe = "'s"; + apostrophe = '\'s'; } name = <a className="theme" onClick={function(){ utils.searchForTerm(profile.username); }}>{profile.username}</a>; } @@ -62,11 +62,11 @@ module.exports = React.createClass({ var loading; if (post.state === Constants.POST_FAILED) { - postClass += " post-fail"; - loading = <a className="theme post-retry pull-right" href="#" onClick={this.props.retryPost}>Retry</a>; + postClass += ' post-fail'; + loading = <a className='theme post-retry pull-right' href='#' onClick={this.props.retryPost}>Retry</a>; } else if (post.state === Constants.POST_LOADING) { - postClass += " post-waiting"; - loading = <img className="post-loading-gif pull-right" src="/static/images/load.gif"/>; + postClass += ' post-waiting'; + loading = <img className='post-loading-gif pull-right' src='/static/images/load.gif'/>; } var embed; diff --git a/web/react/components/post_info.jsx b/web/react/components/post_info.jsx index 37e525717..f6ab0ed8a 100644 --- a/web/react/components/post_info.jsx +++ b/web/react/components/post_info.jsx @@ -12,44 +12,68 @@ module.exports = React.createClass({ }, render: function() { var post = this.props.post; - var isOwner = UserStore.getCurrentId() == post.user_id; - var isAdmin = UserStore.getCurrentUser().roles.indexOf("admin") > -1 + var isOwner = UserStore.getCurrentId() === post.user_id; + var isAdmin = UserStore.getCurrentUser().roles.indexOf('admin') > -1; - var type = "Post"; + var type = 'Post'; if (post.root_id && post.root_id.length > 0) { - type = "Comment"; + type = 'Comment'; } - var comments = ""; - var lastCommentClass = this.props.isLastComment ? " comment-icon__container__show" : " comment-icon__container__hide"; - if (this.props.commentCount >= 1 && post.state !== Constants.POST_FAILED && post.state !== Constants.POST_LOADING) { - comments = <a href="#" className={"comment-icon__container theme" + lastCommentClass} onClick={this.props.handleCommentClick}><span className="comment-icon" dangerouslySetInnerHTML={{__html: Constants.COMMENT_ICON }} />{this.props.commentCount}</a>; + var comments = ''; + var lastCommentClass = ' comment-icon__container__hide'; + if (this.props.isLastComment) { + lastCommentClass = ' comment-icon__container__show'; } - var show_dropdown = isOwner || (this.props.allowReply === "true" && type != "Comment"); - if (post.state === Constants.POST_FAILED || post.state === Constants.POST_LOADING) show_dropdown = false; + if (this.props.commentCount >= 1 && post.state !== Constants.POST_FAILED && post.state !== Constants.POST_LOADING) { + comments = <a href='#' className={'comment-icon__container theme' + lastCommentClass} onClick={this.props.handleCommentClick}><span className='comment-icon' dangerouslySetInnerHTML={{__html: Constants.COMMENT_ICON}} />{this.props.commentCount}</a>; + } + + var showDropdown = isOwner || (this.props.allowReply === 'true' && type !== 'Comment'); + if (post.state === Constants.POST_FAILED || post.state === Constants.POST_LOADING) { + showDropdown = false; + } + + var dropdownContents = []; + var dropdown; + if (showDropdown) { + var dataComments = 0; + if (type === 'Post') { + dataComments = this.props.commentCount; + } + + if (isOwner) { + dropdownContents.push(<li role='presentation'><a href='#' role='menuitem' data-toggle='modal' data-target='#edit_post' data-title={type} data-message={post.message} data-postid={post.id} data-channelid={post.channel_id} data-comments={dataComments}>Edit</a></li>); + } + + if (isOwner || isAdmin) { + dropdownContents.push(<li role='presentation'><a href='#' role='menuitem' data-toggle='modal' data-target='#delete_post' data-title={type} data-postid={post.id} data-channelid={post.channel_id} data-comments={dataComments}>Delete</a></li>); + } + + if (this.props.allowReply === 'true') { + dropdownContents.push(<li role='presentation'><a className='reply-link theme' href='#' onClick={this.props.handleCommentClick}>Reply</a></li>); + } + + dropdown = ( + <div> + <a href='#' className='dropdown-toggle theme' type='button' data-toggle='dropdown' aria-expanded='false' /> + <ul className='dropdown-menu' role='menu'> + {dropdownContents} + </ul> + </div> + ); + } return ( - <ul className="post-header post-info"> - <li className="post-header-col"><time className="post-profile-time">{ utils.displayDateTime(post.create_at) }</time></li> - <li className="post-header-col post-header__reply"> - <div className="dropdown"> - { show_dropdown ? - <div> - <a href="#" className="dropdown-toggle theme" type="button" data-toggle="dropdown" aria-expanded="false" /> - <ul className="dropdown-menu" role="menu"> - { isOwner ? <li role="presentation"><a href="#" role="menuitem" data-toggle="modal" data-target="#edit_post" data-title={type} data-message={post.message} data-postid={post.id} data-channelid={post.channel_id} data-comments={type === "Post" ? this.props.commentCount : 0}>Edit</a></li> - : "" } - { isOwner || isAdmin ? <li role="presentation"><a href="#" role="menuitem" data-toggle="modal" data-target="#delete_post" data-title={type} data-postid={post.id} data-channelid={post.channel_id} data-comments={type === "Post" ? this.props.commentCount : 0}>Delete</a></li> - : "" } - { this.props.allowReply === "true" ? <li role="presentation"><a className="reply-link theme" href="#" onClick={this.props.handleCommentClick}>Reply</a></li> - : "" } - </ul> - </div> - : "" } - </div> - { comments } - </li> + <ul className='post-header post-info'> + <li className='post-header-col'><time className='post-profile-time'>{utils.displayDateTime(post.create_at)}</time></li> + <li className='post-header-col post-header__reply'> + <div className='dropdown'> + {dropdown} + </div> + {comments} + </li> </ul> ); } |