Merge pull request #176 from nickago/MM-1400
MM-1400 Add processing for message-less image posts w/ pluralization
Этот коммит содержится в:
@@ -71,11 +71,22 @@ module.exports = React.createClass({
|
||||
name = <a className="theme" onClick={function(){ utils.searchForTerm(profile.username); }}>{profile.username}</a>;
|
||||
}
|
||||
|
||||
var message = parentPost.message;
|
||||
var message = ""
|
||||
if(parentPost.message) {
|
||||
message = utils.replaceHtmlEntities(parentPost.message)
|
||||
} else if (parentPost.filenames.length) {
|
||||
message = parentPost.filenames[0].split('/').pop();
|
||||
|
||||
if (parentPost.filenames.length === 2) {
|
||||
message += " plus 1 other file";
|
||||
} else if (parentPost.filenames.length > 2) {
|
||||
message += " plus " + (parentPost.filenames.length - 1) + " other files";
|
||||
}
|
||||
}
|
||||
|
||||
comment = (
|
||||
<p className="post-link">
|
||||
<span>Commented on {name}{apostrophe} message: <a className="theme" onClick={this.props.handleCommentClick}>{utils.replaceHtmlEntities(message)}</a></span>
|
||||
<span>Commented on {name}{apostrophe} message: <a className="theme" onClick={this.props.handleCommentClick}>{message}</a></span>
|
||||
</p>
|
||||
);
|
||||
|
||||
|
||||
Ссылка в новой задаче
Block a user