Fix ios Team Switch double tap (#5051)

* Fix ios Team Switch double tap

* Removing check of the user agent
Этот коммит содержится в:
enahum
2017-01-12 17:27:58 -03:00
коммит произвёл Harrison Healey
родитель 046d2c61a5
Коммит aafb8be87c
2 изменённых файлов: 20 добавлений и 14 удалений

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

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

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

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