diff options
| author | Corey Hulen <corey@hulen.com> | 2016-05-04 06:31:42 -0700 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2016-05-04 09:31:42 -0400 |
| commit | 6611229cd7bd3cdfc0082c0a581145aaac0ab322 (patch) | |
| tree | db6670a8c2716179bfe6e07b82588d83d3afb6bd /webapp/components/sidebar.jsx | |
| parent | 6b06f49e8910ed44f619adad15ab268758312852 (diff) | |
| download | chat-6611229cd7bd3cdfc0082c0a581145aaac0ab322.tar.gz chat-6611229cd7bd3cdfc0082c0a581145aaac0ab322.tar.bz2 chat-6611229cd7bd3cdfc0082c0a581145aaac0ab322.zip | |
PLT-2707 Adding option to show DM list from all of server (#2871)
* PLT-2707 Adding option to show DM list from all of server
* Fixing loc
Diffstat (limited to 'webapp/components/sidebar.jsx')
| -rw-r--r-- | webapp/components/sidebar.jsx | 35 |
1 files changed, 13 insertions, 22 deletions
diff --git a/webapp/components/sidebar.jsx b/webapp/components/sidebar.jsx index 4ab8b6b40..4ce89d37c 100644 --- a/webapp/components/sidebar.jsx +++ b/webapp/components/sidebar.jsx @@ -124,8 +124,6 @@ export default class Sidebar extends React.Component { directChannels.sort(this.sortChannelsByDisplayName); - const hiddenDirectChannelCount = UserStore.getActiveOnlyProfileList(true).length - directChannels.length; - const tutorialStep = PreferenceStore.getInt(Preferences.TUTORIAL_STEP, UserStore.getCurrentId(), 999); return { @@ -134,7 +132,6 @@ export default class Sidebar extends React.Component { publicChannels, privateChannels, directChannels, - hiddenDirectChannelCount, unreadCounts: JSON.parse(JSON.stringify(ChannelStore.getUnreadCounts())), showTutorialTip: tutorialStep === TutorialSteps.CHANNEL_POPOVER, currentTeam: TeamStore.getCurrent(), @@ -527,25 +524,19 @@ export default class Sidebar extends React.Component { } head.appendChild(link); - var directMessageMore = null; - if (this.state.hiddenDirectChannelCount > 0) { - directMessageMore = ( - <li key='more'> - <a - href='#' - onClick={this.showMoreDirectChannelsModal} - > - <FormattedMessage - id='sidebar.more' - defaultMessage='More ({count})' - values={{ - count: this.state.hiddenDirectChannelCount - }} - /> - </a> - </li> - ); - } + var directMessageMore = ( + <li key='more'> + <a + href='#' + onClick={this.showMoreDirectChannelsModal} + > + <FormattedMessage + id='sidebar.more' + defaultMessage='More' + /> + </a> + </li> + ); let showChannelModal = false; if (this.state.newChannelModalType !== '') { |