Added cosmetic refactoring
Этот коммит содержится в:
nickago
@@ -23,9 +23,11 @@ var NavbarDropdown = React.createClass({
|
|||||||
TeamStore.addChangeListener(this.onListenerChange);
|
TeamStore.addChangeListener(this.onListenerChange);
|
||||||
|
|
||||||
var self = this;
|
var self = this;
|
||||||
$(this.refs.dropdown.getDOMNode()).on('hide.bs.dropdown', function(e) {
|
$(this.refs.dropdown.getDOMNode()).on('hide.bs.dropdown', function() {
|
||||||
self.blockToggle = true;
|
self.blockToggle = true;
|
||||||
setTimeout(function(){self.blockToggle = false;}, 100);
|
setTimeout(function() {
|
||||||
|
self.blockToggle = false;
|
||||||
|
}, 100);
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
componentWillUnmount: function() {
|
componentWillUnmount: function() {
|
||||||
@@ -46,63 +48,65 @@ var NavbarDropdown = React.createClass({
|
|||||||
return getStateFromStores();
|
return getStateFromStores();
|
||||||
},
|
},
|
||||||
render: function() {
|
render: function() {
|
||||||
var team_link = "";
|
var teamLink = '';
|
||||||
var invite_link = "";
|
var inviteLink = '';
|
||||||
var manage_link = "";
|
var manageLink = '';
|
||||||
var rename_link = "";
|
var renameLink = '';
|
||||||
var currentUser = UserStore.getCurrentUser();
|
var currentUser = UserStore.getCurrentUser();
|
||||||
var isAdmin = false;
|
var isAdmin = false;
|
||||||
|
var teamSettings = null;
|
||||||
|
|
||||||
if (currentUser != null) {
|
if (currentUser != null) {
|
||||||
isAdmin = currentUser.roles.indexOf("admin") > -1;
|
isAdmin = currentUser.roles.indexOf('admin') > -1;
|
||||||
|
|
||||||
invite_link = ( <li> <a href="#" data-toggle="modal" data-target="#invite_member">Invite New Member</a> </li>);
|
inviteLink = (<li> <a href='#' data-toggle='modal' data-target='#invite_member'>Invite New Member</a> </li>);
|
||||||
|
|
||||||
if (this.props.teamType == "O") {
|
if (this.props.teamType === 'O') {
|
||||||
team_link = (
|
teamLink = (
|
||||||
<li>
|
<li>
|
||||||
<a href="#" data-toggle="modal" data-target="#get_link" data-title="Team Invite" data-value={location.origin+"/signup_user_complete/?id="+currentUser.team_id}>Get Team Invite Link</a>
|
<a href='#' data-toggle='modal' data-target='#get_link' data-title='Team Invite' data-value={location.origin + '/signup_user_complete/?id=' + currentUser.team_id}>Get Team Invite Link</a>
|
||||||
</li>
|
</li>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (isAdmin) {
|
if (isAdmin) {
|
||||||
manage_link = ( <li> <a href="#" data-toggle="modal" data-target="#team_members">Manage Team</a> </li>);
|
manageLink = (<li> <a href='#' data-toggle='modal' data-target='#team_members'>Manage Team</a> </li>);
|
||||||
rename_link = ( <li> <a href="#" data-toggle="modal" data-target="#rename_team_link">Rename</a> </li>);
|
renameLink = (<li> <a href='#' data-toggle='modal' data-target='#rename_team_link'>Rename</a> </li>);
|
||||||
|
teamSettings = (<li> <a href='#' data-toggle='modal' data-target='#team_settings'>Team Settings</a> </li>);
|
||||||
}
|
}
|
||||||
|
|
||||||
var teams = [];
|
var teams = [];
|
||||||
|
|
||||||
teams.push(<li className="divider" key="div"></li>);
|
teams.push(<li className='divider' key='div'></li>);
|
||||||
if (this.state.teams.length > 1 && this.state.currentTeam) {
|
if (this.state.teams.length > 1 && this.state.currentTeam) {
|
||||||
var curTeamName = this.state.currentTeam.name;
|
var curTeamName = this.state.currentTeam.name;
|
||||||
this.state.teams.forEach(function(teamName) {
|
this.state.teams.forEach(function(teamName) {
|
||||||
if (teamName !== curTeamName) {
|
if (teamName !== curTeamName) {
|
||||||
teams.push(<li key={ teamName }><a href={utils.getWindowLocationOrigin() + "/" + teamName }>Switch to { teamName }</a></li>);
|
teams.push(<li key={teamName}><a href={utils.getWindowLocationOrigin() + '/' + teamName}>Switch to {teamName}</a></li>);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
teams.push(<li><a href={utils.getWindowLocationOrigin() + "/signup_team" }>Create a New Team</a></li>);
|
teams.push(<li><a href={utils.getWindowLocationOrigin() + '/signup_team'}>Create a New Team</a></li>);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<ul className="nav navbar-nav navbar-right">
|
<ul className='nav navbar-nav navbar-right'>
|
||||||
<li ref="dropdown" className="dropdown">
|
<li ref='dropdown' className='dropdown'>
|
||||||
<a href="#" className="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">
|
<a href='#' className='dropdown-toggle' data-toggle='dropdown' role='button' aria-expanded='false'>
|
||||||
<span className="dropdown__icon" dangerouslySetInnerHTML={{__html: Constants.MENU_ICON }} />
|
<span className='dropdown__icon' dangerouslySetInnerHTML={{__html: Constants.MENU_ICON}} />
|
||||||
</a>
|
</a>
|
||||||
<ul className="dropdown-menu" role="menu">
|
<ul className='dropdown-menu' role='menu'>
|
||||||
<li><a href="#" data-toggle="modal" data-target="#user_settings1">Account Settings</a></li>
|
<li><a href='#' data-toggle='modal' data-target='#user_settings1'>Account Settings</a></li>
|
||||||
{ isAdmin ? <li><a href="#" data-toggle="modal" data-target="#team_settings">Team Settings</a></li> : null }
|
{teamSettings}
|
||||||
{ invite_link }
|
{inviteLink}
|
||||||
{ team_link }
|
{teamLink}
|
||||||
{ manage_link }
|
{manageLink}
|
||||||
{ rename_link }
|
{renameLink}
|
||||||
<li><a href="#" onClick={this.handleLogoutClick}>Logout</a></li>
|
<li><a href='#' onClick={this.handleLogoutClick}>Logout</a></li>
|
||||||
{ teams }
|
{teams}
|
||||||
<li className="divider"></li>
|
<li className='divider'></li>
|
||||||
<li><a target="_blank" href={config.HelpLink}>Help</a></li>
|
<li><a target='_blank' href={config.HelpLink}>Help</a></li>
|
||||||
<li><a target="_blank" href={config.ReportProblemLink}>Report a Problem</a></li>
|
<li><a target='_blank' href={config.ReportProblemLink}>Report a Problem</a></li>
|
||||||
</ul>
|
</ul>
|
||||||
</li>
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
@@ -112,14 +116,13 @@ var NavbarDropdown = React.createClass({
|
|||||||
|
|
||||||
module.exports = React.createClass({
|
module.exports = React.createClass({
|
||||||
displayName: 'SidebarHeader',
|
displayName: 'SidebarHeader',
|
||||||
|
|
||||||
getDefaultProps: function() {
|
getDefaultProps: function() {
|
||||||
return {
|
return {
|
||||||
teamDisplayName: config.SiteName
|
teamDisplayName: config.SiteName
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
|
|
||||||
toggleDropdown: function(e) {
|
toggleDropdown: function() {
|
||||||
if (this.refs.dropdown.blockToggle) {
|
if (this.refs.dropdown.blockToggle) {
|
||||||
this.refs.dropdown.blockToggle = false;
|
this.refs.dropdown.blockToggle = false;
|
||||||
return;
|
return;
|
||||||
@@ -129,25 +132,26 @@ module.exports = React.createClass({
|
|||||||
|
|
||||||
render: function() {
|
render: function() {
|
||||||
var me = UserStore.getCurrentUser();
|
var me = UserStore.getCurrentUser();
|
||||||
|
var profilePicture = null;
|
||||||
|
|
||||||
if (!me) {
|
if (!me) {
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (me.last_picture_update) {
|
||||||
|
profilePicture = (<img className='user__picture' src={'/api/v1/users/' + me.id + '/image?time=' + me.update_at} />);
|
||||||
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="team__header theme">
|
<div className='team__header theme'>
|
||||||
<a href="#" onClick={this.toggleDropdown}>
|
<a href='#' onClick={this.toggleDropdown}>
|
||||||
{ me.last_picture_update ?
|
{profilePicture}
|
||||||
<img className="user__picture" src={"/api/v1/users/" + me.id + "/image?time=" + me.update_at} />
|
<div className='header__info'>
|
||||||
:
|
<div className='user__name'>{'@' + me.username}</div>
|
||||||
null
|
<div className='team__name'>{this.props.teamDisplayName }</div>
|
||||||
}
|
|
||||||
<div className="header__info">
|
|
||||||
<div className="user__name">{ '@' + me.username}</div>
|
|
||||||
<div className="team__name">{ this.props.teamDisplayName }</div>
|
|
||||||
</div>
|
</div>
|
||||||
</a>
|
</a>
|
||||||
<NavbarDropdown ref="dropdown" teamType={this.props.teamType} />
|
<NavbarDropdown ref='dropdown' teamType={this.props.teamType} />
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
Ссылка в новой задаче
Block a user