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

Fxing issue with permalink view and channel header (#2912)

Browse Source
This commit is contained in:
Christopher Speller
2016-05-06 14:08:02 -04:00
committed by Corey Hulen
parent d3f360974b
commit 4f799b980f
2 changed files with 21 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
webapp/components/post_focus_view.jsx
View File

@@ -7,8 +7,6 @@ import PostStore from 'stores/post_store.jsx';
import ChannelStore from 'stores/channel_store.jsx';
import * as GlobalActions from 'action_creators/global_actions.jsx';
import {FormattedMessage} from 'react-intl';
import React from 'react';
export default class PostFocusView extends React.Component {
@@ -79,19 +77,6 @@ export default class PostFocusView extends React.Component {
GlobalActions.emitLoadMorePostsFocusedBottomEvent();
}
getIntroMessage() {
return (
<div className='channel-intro'>
<h4 className='channel-intro__title'>
<FormattedMessage
id='post_focus_view.beginning'
defaultMessage='Beginning of Channel Archives'
/>
</h4>
</div>
);
}
render() {
const postsToHighlight = {};
postsToHighlight[this.state.scrollPostId] = true;
@@ -113,7 +98,6 @@ export default class PostFocusView extends React.Component {
loadMorePostsBottomClicked={this.loadMorePostsBottom}
showMoreMessagesTop={!this.state.atTop}
showMoreMessagesBottom={!this.state.atBottom}
introText={this.getIntroMessage()}
messageSeparatorTime={0}
postsToHighlight={postsToHighlight}
/>

24
webapp/components/posts_view.jsx
View File

@@ -48,7 +48,7 @@ export default class PostsView extends React.Component {
this.scrollStopAction = new DelayedAction(this.handleScrollStop);
let profiles = UserStore.getProfiles();
if (props.channel.type === Constants.DM_CHANNEL) {
if (props.channel && props.channel.type === Constants.DM_CHANNEL) {
profiles = Object.assign({}, profiles, UserStore.getDirectProfiles());
}
@@ -84,7 +84,7 @@ export default class PostsView extends React.Component {
}
onUserChange() {
let profiles = UserStore.getProfiles();
if (this.props.channel.type === Constants.DM_CHANNEL) {
if (this.props.channel && this.props.channel.type === Constants.DM_CHANNEL) {
profiles = Object.assign({}, profiles, UserStore.getDirectProfiles());
}
this.setState({currentUser: UserStore.getCurrentUser(), profiles: JSON.parse(JSON.stringify(profiles))});
@@ -395,6 +395,20 @@ export default class PostsView extends React.Component {
var postList = $(this.refs.postlist);
postList.animate({scrollTop: this.refs.postlist.scrollHeight}, '500');
}
getArchivesIntroMessage() {
return (
<div className='channel-intro'>
<h4 className='channel-intro__title'>
<FormattedMessage
id='post_focus_view.beginning'
defaultMessage='Beginning of Channel Archives'
/>
</h4>
</div>
);
}
componentDidMount() {
if (this.props.postList != null) {
this.updateScrolling();
@@ -405,7 +419,11 @@ export default class PostsView extends React.Component {
UserStore.addChangeListener(this.onUserChange);
}
this.introText = createChannelIntroMessage(this.props.channel);
if (this.props.channel) {
this.introText = createChannelIntroMessage(this.props.channel);
} else {
this.introText = this.getArchivesIntroMessage();
}
window.addEventListener('resize', this.handleResize);
}