ESLint additional rules (#4186)

* Add eslint rule for consistent block padding

* Fix padding consistency issues

* Eslint test for duplicate imports

* Eslint closing bracket location

* Fix eslint jsx closing bracket

* missed a file

* Formatting

* Manual overrides for auto

* Manual overrides for auto

* More minor auto-override manual adjustments
This commit is contained in:
Jaco Greeff
2017-01-18 13:05:01 +01:00
committed by GitHub
parent d608ad2011
commit 08f80f2695
198 changed files with 1612 additions and 921 deletions

View File

@@ -24,7 +24,6 @@ import IdentityIcon from '../../IdentityIcon';
import styles from './account-selector.css';
class AccountSelectorItem extends Component {
static propTypes = {
onSelectAccount: PropTypes.func.isRequired,
account: PropTypes.object.isRequired
@@ -37,15 +36,19 @@ class AccountSelectorItem extends Component {
delete props.account;
delete props.onSelectAccount;
const icon = (<IdentityIcon
inline center
address={ account.address } />
const icon = (
<IdentityIcon
inline center
address={ account.address }
/>
);
const avatar = (<Avatar
className={ styles.avatar }
backgroundColor='none'
icon={ icon } />
const avatar = (
<Avatar
className={ styles.avatar }
backgroundColor='none'
icon={ icon }
/>
);
return (
@@ -55,18 +58,17 @@ class AccountSelectorItem extends Component {
primaryText={ account.name }
secondaryText={ account.address }
leftAvatar={ avatar }
{ ...props } />
{ ...props }
/>
);
}
onSelectAccount = () => {
this.props.onSelectAccount(this.props.account.address);
}
}
export default class AccountSelector extends Component {
static propTypes = {
list: PropTypes.array.isRequired,
selected: PropTypes.object.isRequired,
@@ -87,7 +89,8 @@ export default class AccountSelector extends Component {
open={ this.state.open }
onSelectAccount={ this.onToggleOpen }
autoGenerateNestedIndicator={ false }
nestedListStyle={ { maxHeight: '14em', overflow: 'auto' } } />
nestedListStyle={ { maxHeight: '14em', overflow: 'auto' } }
/>
);
return (
@@ -106,7 +109,8 @@ export default class AccountSelector extends Component {
<AccountSelectorItem
account={ account }
onSelectAccount={ this.onSelectAccount }
key={ index } />
key={ index }
/>
));
}
@@ -122,5 +126,4 @@ export default class AccountSelector extends Component {
this.props.handleSetSelected(address);
this.onToggleOpen();
}
}

View File

@@ -23,9 +23,11 @@ import { setSelectedAccount } from '../actions';
class AccountSelectorContainer extends Component {
render () {
return (<AccountSelector
{ ...this.props }
/>);
return (
<AccountSelector
{ ...this.props }
/>
);
}
}
@@ -42,4 +44,7 @@ const mapDispatchToProps = (dispatch) => {
};
};
export default connect(mapStateToProps, mapDispatchToProps)(AccountSelectorContainer);
export default connect(
mapStateToProps,
mapDispatchToProps
)(AccountSelectorContainer);