IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

PLT-4293 - Adding status indicator to RHS thread (#4292)

Browse Source 
* PLT-4293 - Adding status indicator to RHS thread

* Coming conditional

* Changing const position

* Uber UI changes

* Revert "Uber UI changes"

This reverts commit 6b756c38cc.
This commit is contained in:
Asaad Mahmood
2016-10-25 01:06:03 +05:00
committed by Christopher Speller
parent 5fdb8223fc
commit 4d9f5173bc
4 changed files with 31 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
webapp/components/post_view/components/post.jsx
View File

@@ -199,16 +199,6 @@ export default class Post extends React.Component {
/>
);
if (this.props.compactDisplay) {
profilePic = (
<ProfilePicture
src=''
status={this.props.status}
user={this.props.user}
/>
);
}
if (PostUtils.isSystemMessage(post)) {
profilePic = (
<span
@@ -224,11 +214,20 @@ export default class Post extends React.Component {
}
let compactClass = '';
const profilePicContainer = (<div className='post__img'>{profilePic}</div>);
if (this.props.compactDisplay) {
compactClass = 'post--compact';
profilePic = (
<ProfilePicture
src=''
status={this.props.status}
user={this.props.user}
/>
);
}
const profilePicContainer = (<div className='post__img'>{profilePic}</div>);
let dropdownOpenedClass = '';
if (this.state.dropdownOpened) {
dropdownOpenedClass = 'post--hovered';

14
webapp/components/rhs_comment.jsx
View File

@@ -276,7 +276,7 @@ export default class RhsComment extends React.Component {
);
}
const profilePic = (
let profilePic = (
<ProfilePicture
src={PostUtils.getProfilePicSrcForPost(post, timestamp)}
status={this.props.status}
@@ -287,12 +287,20 @@ export default class RhsComment extends React.Component {
);
let compactClass = '';
let profilePicContainer = (<div className='post__img'>{profilePic}</div>);
if (this.props.compactDisplay) {
compactClass = 'post--compact';
profilePicContainer = '';
profilePic = (
<ProfilePicture
src=''
status={this.props.status}
user={this.props.user}
/>
);
}
const profilePicContainer = (<div className='post__img'>{profilePic}</div>);
let fileAttachment = null;
if (post.file_ids && post.file_ids.length > 0) {
fileAttachment = (

11
webapp/components/rhs_root_post.jsx
View File

@@ -302,12 +302,19 @@ export default class RhsRootPost extends React.Component {
}
let compactClass = '';
let profilePicContainer = (<div className='post__img'>{profilePic}</div>);
if (this.props.compactDisplay) {
compactClass = 'post--compact';
profilePicContainer = '';
profilePic = (
<ProfilePicture
src=''
status={this.props.status}
user={this.props.user}
/>
);
}
const profilePicContainer = (<div className='post__img'>{profilePic}</div>);
const messageWrapper = <PostMessageContainer post={post}/>;
let flag;

3
webapp/components/search_results_item.jsx
View File

@@ -106,10 +106,9 @@ export default class SearchResultsItem extends React.Component {
);
let compactClass = '';
let profilePicContainer = (<div className='post__img'>{profilePic}</div>);
const profilePicContainer = (<div className='post__img'>{profilePic}</div>);
if (this.props.compactDisplay) {
compactClass = 'post--compact';
profilePicContainer = '';
}
let flag;