diff options
author | Christopher Speller <crspeller@gmail.com> | 2015-11-02 14:10:59 -0500 |
---|---|---|
committer | Christopher Speller <crspeller@gmail.com> | 2015-11-02 14:10:59 -0500 |
commit | 17233b1dce530eef75e16944da7abdb060d2c27e (patch) | |
tree | 76aaace305ed6fac3cb22ace8064229dbfa8ea04 /web/react/components/channel_header.jsx | |
parent | 16171468dd51bb60216b5b9fa26866ec0c38d81c (diff) | |
parent | bc57489d8b9786ae15374b93e0691488972af0a6 (diff) | |
download | chat-17233b1dce530eef75e16944da7abdb060d2c27e.tar.gz chat-17233b1dce530eef75e16944da7abdb060d2c27e.tar.bz2 chat-17233b1dce530eef75e16944da7abdb060d2c27e.zip |
Merge pull request #1259 from stasvovk/PLT-639
PLT-639: display full name, nickname or username in direct messages
Diffstat (limited to 'web/react/components/channel_header.jsx')
-rw-r--r-- | web/react/components/channel_header.jsx | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/web/react/components/channel_header.jsx b/web/react/components/channel_header.jsx index 101fd85e5..20f106f30 100644 --- a/web/react/components/channel_header.jsx +++ b/web/react/components/channel_header.jsx @@ -4,6 +4,7 @@ const ChannelStore = require('../stores/channel_store.jsx'); const UserStore = require('../stores/user_store.jsx'); const SearchStore = require('../stores/search_store.jsx'); +const PreferenceStore = require('../stores/preference_store.jsx'); const NavbarSearchBox = require('./search_bar.jsx'); const AsyncClient = require('../utils/async_client.jsx'); const Client = require('../utils/client.jsx'); @@ -46,12 +47,14 @@ export default class ChannelHeader extends React.Component { ChannelStore.addExtraInfoChangeListener(this.onListenerChange); SearchStore.addSearchChangeListener(this.onListenerChange); UserStore.addChangeListener(this.onListenerChange); + PreferenceStore.addChangeListener(this.onListenerChange); } componentWillUnmount() { ChannelStore.removeChangeListener(this.onListenerChange); ChannelStore.removeExtraInfoChangeListener(this.onListenerChange); SearchStore.removeSearchChangeListener(this.onListenerChange); - UserStore.addChangeListener(this.onListenerChange); + UserStore.removeChangeListener(this.onListenerChange); + PreferenceStore.removeChangeListener(this.onListenerChange); } onListenerChange() { const newState = this.getStateFromStores(); @@ -134,7 +137,7 @@ export default class ChannelHeader extends React.Component { } else { contact = this.state.users[0]; } - channelTitle = contact.nickname || contact.username; + channelTitle = Utils.displayUsername(contact.id); } } |