diff options
author | Joram Wilander <jwawilander@gmail.com> | 2016-09-06 09:56:46 -0400 |
---|---|---|
committer | Harrison Healey <harrisonmhealey@gmail.com> | 2016-09-06 09:56:46 -0400 |
commit | c201ef17754e66ce16bc12d243baf57fb1b6d8d4 (patch) | |
tree | 2e0e5de4a2600194fbcfdaf9d1e3003a84bbeed4 /webapp/components/post_view/post_view_controller.jsx | |
parent | a44a5aadf1766d039b80fe7d77455f8b9e0ff2ff (diff) | |
download | chat-c201ef17754e66ce16bc12d243baf57fb1b6d8d4.tar.gz chat-c201ef17754e66ce16bc12d243baf57fb1b6d8d4.tar.bz2 chat-c201ef17754e66ce16bc12d243baf57fb1b6d8d4.zip |
Add statuses to profiles pictures and remove from header in DMs (#3940)
Diffstat (limited to 'webapp/components/post_view/post_view_controller.jsx')
-rw-r--r-- | webapp/components/post_view/post_view_controller.jsx | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/webapp/components/post_view/post_view_controller.jsx b/webapp/components/post_view/post_view_controller.jsx index 9ff986b43..840f71f23 100644 --- a/webapp/components/post_view/post_view_controller.jsx +++ b/webapp/components/post_view/post_view_controller.jsx @@ -45,10 +45,7 @@ export default class PostViewController extends React.Component { const joinLeaveEnabled = PreferenceStore.getBool(Constants.Preferences.CATEGORY_ADVANCED_SETTINGS, 'join_leave', true); - let statuses; - if (channel && channel.type !== Constants.DM_CHANNEL) { - statuses = Object.assign({}, UserStore.getStatuses()); - } + const statuses = Object.assign({}, UserStore.getStatuses()); // If we haven't received a page time then we aren't done loading the posts yet const loading = PostStore.getLatestPostFromPageTime(channel.id) === 0; @@ -133,13 +130,7 @@ export default class PostViewController extends React.Component { } onStatusChange() { - const channel = this.state.channel; - let statuses; - if (channel && channel.type !== Constants.DM_CHANNEL) { - statuses = Object.assign({}, UserStore.getStatuses()); - } - - this.setState({statuses}); + this.setState({statuses: Object.assign({}, UserStore.getStatuses())}); } onActivate() { |