Fixing react warnings on permalink return

This commit is contained in:
Christopher Speller
2016-03-29 19:24:53 -04:00
parent a6a0f18166
commit e7ea080fd3
3 changed files with 11 additions and 5 deletions

View File

@@ -28,18 +28,19 @@ export default class PermalinkView extends React.Component {
const channel = ChannelStore.getCurrent();
const channelId = channel ? channel.id : '';
const channelName = channel ? channel.name : '';
const teamURL = TeamStore.getCurrentTeamUrl();
const team = TeamStore.getCurrent();
const teamName = team ? team.name : '';
const profiles = JSON.parse(JSON.stringify(UserStore.getProfiles()));
return {
channelId,
channelName,
profiles,
teamURL,
teamName,
postId
};
}
isStateValid() {
return this.state.channelId !== '' && this.state.profiles && this.state.teamURL;
return this.state.channelId !== '' && this.state.profiles && this.state.teamName;
}
updateState() {
this.setState(this.getStateFromStores(this.props));
@@ -64,7 +65,7 @@ export default class PermalinkView extends React.Component {
return true;
}
if (nextState.teamURL !== this.state.teamURL) {
if (nextState.teamName !== this.state.teamName) {
return true;
}
@@ -87,7 +88,7 @@ export default class PermalinkView extends React.Component {
id='archive-link-home'
>
<Link
to={this.state.teamURL + '/channels/' + this.state.channelName}
to={'/' + this.state.teamName + '/channels/' + this.state.channelName}
>
<FormattedMessage
id='center_panel.recent'

View File

@@ -384,6 +384,7 @@ export default class PostsView extends React.Component {
}
componentWillUnmount() {
window.removeEventListener('resize', this.handleResize);
this.scrollStopAction.cancel();
}
componentDidUpdate() {
if (this.props.postList != null) {

View File

@@ -24,4 +24,8 @@ export default class DelayedAction {
this.timer = window.setTimeout(this.fire, timeout);
}
cancel() {
window.clearTimeout(this.timer);
}
}