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

Reverted New Messages indicator in center channel (#2853)

Browse Source
This commit is contained in:
Harrison Healey
2016-05-02 17:16:10 -04:00
committed by Corey Hulen
parent 8125f3ca36
commit 95de1468ac
2 changed files with 0 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
webapp/components/posts_view.jsx
View File

@@ -50,7 +50,6 @@ export default class PostsView extends React.Component {
centerPosts: PreferenceStore.get(Preferences.CATEGORY_DISPLAY_SETTINGS, Preferences.CHANNEL_DISPLAY_MODE, Preferences.CHANNEL_DISPLAY_MODE_DEFAULT) === Preferences.CHANNEL_DISPLAY_MODE_CENTERED,
isScrolling: false,
topPostId: null,
showUnreadMessageAlert: false,
currentUser: UserStore.getCurrentUser(),
profiles: UserStore.getProfiles()
};
@@ -409,13 +408,6 @@ export default class PostsView extends React.Component {
}
}
componentWillReceiveProps(nextProps) {
if (this.props.postList && this.props.postList.order.length) {
if (this.props.postList.order[0] !== nextProps.postList.order[0] && nextProps.scrollType !== PostsView.SCROLL_TYPE_BOTTOM && nextProps.scrollType !== PostsView.SCROLL_TYPE_NEW_MESSAGE && nextProps.postList.posts[nextProps.postList.order[0]].user_id !== nextProps.currentUser.id && this.props.postList.order[1] !== nextProps.postList.order[0]) { // new message from another user and not deleted
this.setState({showUnreadMessageAlert: true});
} else if (nextProps.scrollType === PostsView.SCROLL_TYPE_BOTTOM) {
this.setState({showUnreadMessageAlert: false});
}
}
if (!this.props.isActive && nextProps.isActive) {
this.updateState();
PreferenceStore.addChangeListener(this.updateState);
@@ -550,18 +542,6 @@ export default class PostsView extends React.Component {
</div>
</div>
</div>
<div
className='post-list__new-messages-below'
onClick={this.scrollToBottomAnimated}
hidden={!this.state.showUnreadMessageAlert}
>
<i className='fa fa-angle-down'></i>
&nbsp;
<FormattedMessage
id='posts_view.newMsg'
defaultMessage='New Messages'
/>
</div>
</div>
);
}

27
webapp/sass/layout/_post.scss
View File

@@ -170,33 +170,6 @@ body.ios {
}
}
.post-list__new-messages-below {
@include single-transition(bottom .5s cubic-bezier(86, 0, 07, 1));
@include opacity(.9);
background-color: $black;
border-radius: 1em;
bottom: 10px;
color: $white;
cursor: pointer;
display: inline-block;
left: 50%;
padding: .3em .75em;
position: absolute;
transform: translateX(-50%);
&[hidden] {
bottom: -30px;
}
.fa {
font-size: 17px;
font-weight: bold;
margin-right: 1px;
position: relative;
top: 1px;
}
}
.file-overlay {
color: $white;
font-size: em(20px);