PLT-5188: Reinstate delete option on system messages. (#5113)

* PLT-5188: Reinstate delete option on system messages.

* Fix styling.

* Fix empty hover box.
Этот коммит содержится в:
George Goldberg
2017-02-28 21:28:37 +00:00
коммит произвёл Harrison Healey
родитель 25b9b7d26b
Коммит 5a3bc43668
2 изменённых файлов: 48 добавлений и 31 удалений

Просмотреть файл

@@ -53,10 +53,8 @@ export default class PostInfo extends React.Component {
} }
createDropdown() { createDropdown() {
var post = this.props.post; const post = this.props.post;
const isSystemMessage = PostUtils.isSystemMessage(post);
this.canDelete = PostUtils.canDeletePost(post);
this.canEdit = PostUtils.canEditPost(post, this.editDisableAction);
if (post.state === Constants.POST_FAILED || post.state === Constants.POST_LOADING) { if (post.state === Constants.POST_FAILED || post.state === Constants.POST_LOADING) {
return ''; return '';
@@ -131,6 +129,7 @@ export default class PostInfo extends React.Component {
} }
} }
if (!isSystemMessage) {
dropdownContents.push( dropdownContents.push(
<li <li
key='copyLink' key='copyLink'
@@ -147,6 +146,7 @@ export default class PostInfo extends React.Component {
</a> </a>
</li> </li>
); );
}
if (this.canDelete) { if (this.canDelete) {
dropdownContents.push( dropdownContents.push(
@@ -267,6 +267,9 @@ export default class PostInfo extends React.Component {
var commentCountText = this.props.commentCount; var commentCountText = this.props.commentCount;
const flagIcon = Constants.FLAG_ICON_SVG; const flagIcon = Constants.FLAG_ICON_SVG;
this.canDelete = PostUtils.canDeletePost(post);
this.canEdit = PostUtils.canEditPost(post, this.editDisableAction);
if (this.props.commentCount >= 1) { if (this.props.commentCount >= 1) {
showCommentClass = ' icon--show'; showCommentClass = ' icon--show';
} else { } else {
@@ -296,19 +299,22 @@ export default class PostInfo extends React.Component {
{this.createRemovePostButton()} {this.createRemovePostButton()}
</li> </li>
); );
} else if (!PostUtils.isSystemMessage(post)) { } else {
const dropdown = this.createDropdown();
if (dropdown) {
options = ( options = (
<li className='col col__reply'> <li className='col col__reply'>
<div <div
className='dropdown' className='dropdown'
ref='dotMenu' ref='dotMenu'
> >
{this.createDropdown()} {dropdown}
</div> </div>
{comments} {comments}
</li> </li>
); );
} }
}
let flag; let flag;
let flagFunc; let flagFunc;

Просмотреть файл

@@ -518,6 +518,17 @@
position: relative; position: relative;
word-wrap: break-word; word-wrap: break-word;
&.post--system {
.post__header {
.col__reply {
min-width: 0;
}
.dropdown {
margin-right: 0;
}
}
}
&:hover { &:hover {
.dropdown, .dropdown,
.comment-icon__container, .comment-icon__container,