Этот коммит содержится в:
Christopher Speller
2015-10-16 10:15:52 -04:00
родитель 3c593af598
Коммит 495673d80d
11 изменённых файлов: 132 добавлений и 103 удалений

Просмотреть файл

@@ -46,7 +46,7 @@ export default class Sidebar extends React.Component {
const state = this.getStateFromStores();
state.newChannelModalType = '';
state.showMoreDirectChannelsModal = false;
state.showDirectChannelsModal = false;
state.loadingDMChannel = -1;
this.state = state;
@@ -471,11 +471,13 @@ export default class Sidebar extends React.Component {
}
let closeButton = null;
const removeTooltip = <Tooltip>{'Remove from list'}</Tooltip>;
const removeTooltip = (
<Tooltip id='remove-dm-tooltip'>{'Remove from list'}</Tooltip>
);
if (handleClose && !badge) {
closeButton = (
<OverlayTrigger
delayShow='1000'
delayShow={1000}
placement='top'
overlay={removeTooltip}
>
@@ -564,8 +566,12 @@ export default class Sidebar extends React.Component {
showChannelModal = true;
}
const createChannelTootlip = <Tooltip>{'Create new channel'}</Tooltip>;
const createGroupTootlip = <Tooltip>{'Create new group'}</Tooltip>;
const createChannelTootlip = (
<Tooltip id='new-channel-tooltip' >{'Create new channel'}</Tooltip>
);
const createGroupTootlip = (
<Tooltip id='new-group-tooltip'>{'Create new group'}</Tooltip>
);
return (
<div>
@@ -607,7 +613,7 @@ export default class Sidebar extends React.Component {
<h4>
{'Channels'}
<OverlayTrigger
delayShow='500'
delayShow={500}
placement='top'
overlay={createChannelTootlip}
>
@@ -640,7 +646,7 @@ export default class Sidebar extends React.Component {
<h4>
{'Private Groups'}
<OverlayTrigger
delayShow='500'
delayShow={500}
placement='top'
overlay={createGroupTootlip}
>