Fix ios Team Switch double tap (#5051)

* Fix ios Team Switch double tap

* Removing check of the user agent
This commit is contained in:
enahum
2017-01-12 17:27:58 -03:00
committed by Harrison Healey
parent 046d2c61a5
commit aafb8be87c
2 changed files with 20 additions and 14 deletions

View File

@@ -7,9 +7,6 @@ import React from 'react';
import {Link} from 'react-router/es6';
import {Tooltip, OverlayTrigger} from 'react-bootstrap';
import {isMobile} from 'utils/utils.jsx';
import {isMobileApp} from 'utils/user_agent.jsx';
export default class TeamButton extends React.Component {
constructor(props) {
super(props);
@@ -50,7 +47,14 @@ export default class TeamButton extends React.Component {
</div>
);
}
if (!isMobile() && !isMobileApp()) {
if (this.props.isMobile) {
btn = (
<div className={'team-btn ' + btnClass}>
{badge}
{content}
</div>
);
} else {
btn = (
<OverlayTrigger
delayShow={Constants.OVERLAY_TIME_DELAY}
@@ -67,13 +71,6 @@ export default class TeamButton extends React.Component {
</div>
</OverlayTrigger>
);
} else {
btn = (
<div className={'team-btn ' + btnClass}>
{badge}
{content}
</div>
);
}
return (
@@ -110,6 +107,7 @@ TeamButton.propTypes = {
tip: React.PropTypes.node.isRequired,
active: React.PropTypes.bool,
disabled: React.PropTypes.bool,
isMobile: React.PropTypes.bool,
unread: React.PropTypes.bool,
mentions: React.PropTypes.number,
placement: React.PropTypes.oneOf(['left', 'right', 'top', 'bottom'])

View File

@@ -34,7 +34,8 @@ export default class TeamSidebar extends React.Component {
teamListings: TeamStore.getTeamListings(),
teamMembers,
currentTeamId,
show: teamMembers && teamMembers.length > 1
show: teamMembers && teamMembers.length > 1,
isMobile: Utils.isMobile()
};
}
@@ -53,12 +54,16 @@ export default class TeamSidebar extends React.Component {
}
componentDidUpdate(prevProps, prevState) {
$('.team-wrapper').perfectScrollbar();
if (!this.state.isMobile) {
$('.team-wrapper').perfectScrollbar();
}
// reset the scrollbar upon switching teams
if (this.state.currentTeam !== prevState.currentTeam) {
this.refs.container.scrollTop = 0;
$('.team-wrapper').perfectScrollbar('update');
if (!this.state.isMobile) {
$('.team-wrapper').perfectScrollbar('update');
}
}
}
@@ -121,6 +126,7 @@ export default class TeamSidebar extends React.Component {
url={`/${team.name}`}
tip={team.display_name}
active={team.id === this.state.currentTeamId}
isMobile={this.state.isMobile}
displayName={team.display_name}
unread={team.unread}
mentions={team.mentions}
@@ -134,6 +140,7 @@ export default class TeamSidebar extends React.Component {
btnClass='team-btn__add'
key='more_teams'
url='/select_team'
isMobile={this.state.isMobile}
tip={
<FormattedMessage
id='team_sidebar.join'
@@ -149,6 +156,7 @@ export default class TeamSidebar extends React.Component {
btnClass='team-btn__add'
key='more_teams'
url='/create_team'
isMobile={this.state.isMobile}
tip={
<FormattedMessage
id='navbar_dropdown.create'