From 7b233f224ce82949d5d56130d4772a056ae7fdf7 Mon Sep 17 00:00:00 2001
From: AlexKVal <alexkval@gmail.com>
Date: Sun, 23 Aug 2015 16:28:37 +0300
Subject: [PATCH] fixup! Fix eslint warnings.

---
 .eslintrc       | 2 +-
 src/MenuItem.js | 5 +----
 src/Modal.js    | 3 +--
 src/Tabs.js     | 2 +-
 src/Tooltip.js  | 3 +--
 5 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/.eslintrc b/.eslintrc
index 3374e6eda1..192c419eec 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -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,
diff --git a/src/MenuItem.js b/src/MenuItem.js
index 85cfb3977a..6d667de7a2 100644
--- a/src/MenuItem.js
+++ b/src/MenuItem.js
@@ -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'
diff --git a/src/Modal.js b/src/Modal.js
index 7f8be42838..504843f8d9 100644
--- a/src/Modal.js
+++ b/src/Modal.js
@@ -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() {
diff --git a/src/Tabs.js b/src/Tabs.js
index 38ad3a4ed2..ebea21243e 100644
--- a/src/Tabs.js
+++ b/src/Tabs.js
@@ -106,7 +106,7 @@ const Tabs = React.createClass({
     let {
       id,
       className,
-      style, // eslint-disable-line react/prop-types
+      style,
       position,
       bsStyle,
       tabWidth,
diff --git a/src/Tooltip.js b/src/Tooltip.js
index b500244c37..2691b14abf 100644
--- a/src/Tooltip.js
+++ b/src/Tooltip.js
@@ -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 = {