diff options
author | enahum <nahumhbl@gmail.com> | 2017-01-23 06:11:37 -0300 |
---|---|---|
committer | George Goldberg <george@gberg.me> | 2017-01-23 09:11:37 +0000 |
commit | b064457c745ae6bf27e5e6933a0a7406f3f4921d (patch) | |
tree | 4ffbdf18bbfee9c88c23aecdda8cc6be2a5f20a8 | |
parent | 784d85f46d1dee7ab74f7e12243815712a1d6099 (diff) | |
download | chat-b064457c745ae6bf27e5e6933a0a7406f3f4921d.tar.gz chat-b064457c745ae6bf27e5e6933a0a7406f3f4921d.tar.bz2 chat-b064457c745ae6bf27e5e6933a0a7406f3f4921d.zip |
Random fixes (#5145)
* Fix OVERLAY_TIME_DELAY in sidebar_header
* Fix webhook channel selection by adding a filter
-rw-r--r-- | webapp/components/channel_select.jsx | 14 | ||||
-rw-r--r-- | webapp/components/sidebar_header.jsx | 4 |
2 files changed, 14 insertions, 4 deletions
diff --git a/webapp/components/channel_select.jsx b/webapp/components/channel_select.jsx index 59bf2f15a..194de3874 100644 --- a/webapp/components/channel_select.jsx +++ b/webapp/components/channel_select.jsx @@ -31,12 +31,13 @@ export default class ChannelSelect extends React.Component { super(props); this.handleChannelChange = this.handleChannelChange.bind(this); + this.filterChannels = this.filterChannels.bind(this); this.compareByDisplayName = this.compareByDisplayName.bind(this); AsyncClient.getMoreChannels(true); this.state = { - channels: ChannelStore.getAll().sort(this.compareByDisplayName) + channels: ChannelStore.getAll().filter(this.filterChannels).sort(this.compareByDisplayName) }; } @@ -50,10 +51,19 @@ export default class ChannelSelect extends React.Component { handleChannelChange() { this.setState({ - channels: ChannelStore.getAll().concat(ChannelStore.getMoreAll()).sort(this.compareByDisplayName) + channels: ChannelStore.getAll().concat(ChannelStore.getMoreAll()). + filter(this.filterChannels).sort(this.compareByDisplayName) }); } + filterChannels(channel) { + if (channel.display_name) { + return true; + } + + return false; + } + compareByDisplayName(channelA, channelB) { return channelA.display_name.localeCompare(channelB.display_name); } diff --git a/webapp/components/sidebar_header.jsx b/webapp/components/sidebar_header.jsx index ded3b5d1a..9bc4a5639 100644 --- a/webapp/components/sidebar_header.jsx +++ b/webapp/components/sidebar_header.jsx @@ -10,7 +10,7 @@ import * as Utils from 'utils/utils.jsx'; import SidebarHeaderDropdown from './sidebar_header_dropdown.jsx'; import {Tooltip, OverlayTrigger} from 'react-bootstrap'; -import {Preferences, TutorialSteps, OVERLAY_TIME_DELAY} from 'utils/constants.jsx'; +import {Preferences, TutorialSteps, Constants} from 'utils/constants.jsx'; import {createMenuTip} from 'components/tutorial/tutorial_tip.jsx'; export default class SidebarHeader extends React.Component { @@ -78,7 +78,7 @@ export default class SidebarHeader extends React.Component { teamNameWithToolTip = ( <OverlayTrigger trigger={['hover', 'focus']} - delayShow={OVERLAY_TIME_DELAY} + delayShow={Constants.OVERLAY_TIME_DELAY} placement='bottom' overlay={<Tooltip id='team-name__tooltip'>{this.props.teamDescription}</Tooltip>} ref='descriptionOverlay' |