Skip to content

Commit

Permalink
fixup! Fix eslint warnings.
Browse files Browse the repository at this point in the history
  • Loading branch information
AlexKVal committed Aug 23, 2015
1 parent cd261df commit 7b233f2
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"react/no-did-mount-set-state": 2,
"react/no-did-update-set-state": 2,
"react/no-multi-comp": 2,
"react/prop-types": [2, { "ignore": [ "children", "className" ] }],
"react/prop-types": [2, { "ignore": [ "children", "className", "style" ] }],
"react/react-in-jsx-scope": 2,
"react/self-closing-comp": 2,
"react/wrap-multilines": 2,
Expand Down
5 changes: 1 addition & 4 deletions src/MenuItem.js
Original file line number Diff line number Diff line change
Expand Up @@ -39,13 +39,10 @@ export default class MenuItem extends React.Component {
disabled: this.props.disabled
};

// we don't want to expose the `style` property
const style = this.props.style; // eslint-disable-line react/prop-types

return (
<li role='presentation'
className={classnames(this.props.className, classes)}
style={style}
style={this.props.style}
>
<SafeAnchor
role='menuitem'
Expand Down
3 changes: 1 addition & 2 deletions src/Modal.js
Original file line number Diff line number Diff line change
Expand Up @@ -305,8 +305,7 @@ const Modal = React.createClass({
this.iosClickHack();
}

this.setState(this._getStyles() //eslint-disable-line react/no-did-mount-set-state
, () => this.focusModalContent());
this.setState(this._getStyles(), () => this.focusModalContent());
},

onHide() {
Expand Down
2 changes: 1 addition & 1 deletion src/Tabs.js
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ const Tabs = React.createClass({
let {
id,
className,
style, // eslint-disable-line react/prop-types
style,
position,
bsStyle,
tabWidth,
Expand Down
3 changes: 1 addition & 2 deletions src/Tooltip.js
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,7 @@ const Tooltip = React.createClass({
const style = {
'left': this.props.positionLeft,
'top': this.props.positionTop,
// we don't want to expose the `style` property
...this.props.style // eslint-disable-line react/prop-types
...this.props.style
};

const arrowStyle = {
Expand Down

0 comments on commit 7b233f2

Please sign in to comment.