Merge pull request react-bootstrap#1021 from AlexKVal/eslintMisc

Eslint misc cleanup

Author: jquense

src/Collapse.js

@@ -7,7 +7,7 @@ let capitalize = str => str[0].toUpperCase() + str.substr(1);
 
 // reading a dimension prop will cause the browser to recalculate,
 // which will let our animations work
-let triggerBrowserReflow = node => node.offsetHeight; //eslint-disable-line no-unused-expressions
+let triggerBrowserReflow = node => node.offsetHeight;
 
 const MARGINS = {
   height: ['marginTop', 'marginBottom'],

src/Input.js

@@ -5,7 +5,7 @@ import deprecationWarning from './utils/deprecationWarning';
 
 class Input extends InputBase {
   render() {
-    if (this.props.type === 'static') { // eslint-disable-line react/prop-types
+    if (this.props.type === 'static') {
       deprecationWarning('Input type=static', 'StaticText');
       return <FormControls.Static {...this.props} />;
     }

src/ModalHeader.js

@@ -13,7 +13,6 @@ class ModalHeader extends React.Component {
         { this.props.closeButton &&
           <button
             className='close'
-            aria-label={this.props['aria-label'] || 'Close'} //eslint-disable-line react/prop-types
             onClick={this.props.onHide}
           >
             <span aria-hidden="true">
@@ -31,6 +30,11 @@ class ModalHeader extends React.Component {
 ModalHeader.__isModalHeader = true;
 
 ModalHeader.propTypes = {
+  /**
+   * The 'aria-label' attribute is used to define a string that labels the current element.
+   * It is used for Assistive Technology when the label text is not visible on screen.
+   */
+  'aria-label': React.PropTypes.string,
   /**
    * A css class applied to the Component
    */
@@ -47,6 +51,7 @@ ModalHeader.propTypes = {
 };
 
 ModalHeader.defaultProps = {
+  'aria-label': 'Close',
   modalClassName: 'modal-header',
   closeButton: false
 };

src/NavItem.js

@@ -29,7 +29,7 @@ const NavItem = React.createClass({
         title,
         target,
         children,
-        'aria-controls': ariaControls,  // eslint-disable-line react/prop-types
+        'aria-controls': ariaControls,
         ...props } = this.props;
     let classes = {
           active,

src/Overlay.js

@@ -1,4 +1,6 @@
-/*eslint-disable object-shorthand, react/prop-types */
+/* eslint react/prop-types: [2, {ignore: ["container", "containerPadding", "target", "placement", "children"] }] */
+/* These properties are validated in 'Portal' and 'Position' components */
+
 import React, { cloneElement } from 'react';
 import Portal from './Portal';
 import Position from './Position';

src/PaginationButton.js

@@ -41,7 +41,7 @@ const PaginationButton = React.createClass({
 
     let {
       className,
-      ...anchorProps // eslint-disable-line object-shorthand
+      ...anchorProps
     } = this.props;
 
     return (

src/Popover.js

@@ -1,4 +1,3 @@
-/* eslint-disable react/no-multi-comp */
 import React from 'react';
 import classNames from 'classnames';
 import BootstrapMixin from './BootstrapMixin';

src/Portal.js

@@ -1,4 +1,3 @@
-/*eslint-disable react/prop-types */
 import React from 'react';
 import CustomPropTypes from './utils/CustomPropTypes';
 import domUtils from './utils/domUtils';

src/Tooltip.js

@@ -1,4 +1,3 @@
-/* eslint-disable react/no-multi-comp */
 import React from 'react';
 import classNames from 'classnames';
 import BootstrapMixin from './BootstrapMixin';

src/utils/overlayPositionUtils.js

@@ -25,7 +25,7 @@ const utils = {
       domUtils.getOffset(target) : domUtils.getPosition(target, container);
 
     return {
-      ...offset, // eslint-disable-line object-shorthand
+      ...offset,
       height: target.offsetHeight,
       width: target.offsetWidth
     };