phlux/mattermostest
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #777 from mattermost/revert-mm9922

Browse Source 
Revert "Merge pull request #745 from mattermost/mm9922"
This commit is contained in:
Yuya Ochiai
2018-05-01 21:35:30 +09:00
committed by GitHub
parent ed21f23275 846f05fac2
commit 7379ad21d2
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/browser/components/MainPage.jsx
View File

@@ -317,7 +317,6 @@ const MainPage = createReactClass({
authServerURL = `${tmpURL.protocol}//${tmpURL.host}`; authServerURL = `${tmpURL.protocol}//${tmpURL.host}`;
authInfo = this.state.loginQueue[0].authInfo; authInfo = this.state.loginQueue[0].authInfo;
} }
var currentTeamURL = this.props.teams[this.state.key].url;
var modal = ( var modal = (
<NewTeamModal <NewTeamModal
show={this.state.showNewTeamModal} show={this.state.showNewTeamModal}
@@ -365,7 +364,7 @@ const MainPage = createReactClass({
{ viewsRow } { viewsRow }
</Grid> </Grid>
<TransitionGroup> <TransitionGroup>
{ (this.state.targetURL === '' || this.state.targetURL.startsWith(currentTeamURL)) ? { (this.state.targetURL === '') ?
null : null :
<CSSTransition <CSSTransition
classNames='hovering' classNames='hovering'