diff options
author | Stas Vovk <stas@vovk.me> | 2015-11-01 01:08:18 +0200 |
---|---|---|
committer | Stas Vovk <stas@vovk.me> | 2015-11-01 01:08:18 +0200 |
commit | b84af104557fa9d0a7270b62def9b7c567e23f9b (patch) | |
tree | e9cc198c7a8544fe04af9832829b41a5c2ab93d4 /web/react/components/channel_header.jsx | |
parent | e646c97f5291bb23d4e1687d99ee1aab2932a7f3 (diff) | |
download | chat-b84af104557fa9d0a7270b62def9b7c567e23f9b.tar.gz chat-b84af104557fa9d0a7270b62def9b7c567e23f9b.tar.bz2 chat-b84af104557fa9d0a7270b62def9b7c567e23f9b.zip |
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); } } |