Merge pull request react-bootstrap#1335 from AlexKVal/airbnb

Left `Airbnb` rules.

.eslintrc

@@ -16,13 +16,10 @@
     "constructor-super": 2,
     "comma-dangle": 0,
     "eqeqeq": [2, "allow-null"],
-    "func-names": 0,
-    "guard-for-in": 0,
     "one-var": [2, { "initialized": "never" }],
     "prefer-const": 0,
     "key-spacing": 0,
     "no-eq-null": 0,
-    "no-else-return": 0,
     "no-param-reassign": 0,
     "no-this-before-super": 2,
     "no-undef": 2,

docs/server.js

@@ -21,11 +21,11 @@ if (development) {
   let webpackPort = process.env.WEBPACK_DEV_PORT;
   let target = `http://${ip.address()}:${webpackPort}`;
 
-  app.get('/assets/*', function(req, res) {
+  app.get('/assets/*', (req, res) => {
     proxy.web(req, res, { target });
   });
 
-  proxy.on('error', function(e) {
+  proxy.on('error', e => {
     console.log('Could not connect to webpack proxy'.red);
     console.log(e.toString().red);
   });
@@ -49,7 +49,7 @@ if (development) {
   app.use(express.static(path.join(__dirname, '../docs-built')));
 }
 
-app.listen(port, function() {
+app.listen(port, () => {
   console.log(`Server started at:`);
   console.log(`- http://localhost:${port}`);
   console.log(`- http://${ip.address()}:${port}`);

docs/src/PropTable.js

@@ -174,9 +174,9 @@ const PropTable = React.createClass({
       return 'function';
     } else if (typeName === 'bool') {
       return 'boolean';
-    } else {
-      return typeName;
     }
+
+    return typeName;
   },
 
   renderEnum(enumType) {

karma.conf.js

@@ -1,4 +1,4 @@
-/* eslint no-var: 0, babel/object-shorthand: 0, vars-on-top: 0 */
+/* eslint no-var: 0, babel/object-shorthand: 0, vars-on-top: 0, func-names: 0 */
 require('babel/register');
 
 var webpackConfig = require('./webpack/test.config.js');

src/ButtonGroup.js

@@ -15,7 +15,7 @@ const ButtonGroup = React.createClass({
      */
     block: CustomPropTypes.all([
       React.PropTypes.bool,
-      function(props) {
+      props => {
         if (props.block && !props.vertical) {
           return new Error('The block property requires the vertical property to be set to have any effect');
         }

src/Carousel.js

@@ -208,7 +208,7 @@ const Carousel = React.createClass({
   renderIndicators() {
     let indicators = [];
     ValidComponentChildren
-      .forEach(this.props.children, function(child, index) {
+      .forEach(this.props.children, (child, index) => {
         indicators.push(
           this.renderIndicator(child, index),
 
@@ -233,7 +233,7 @@ const Carousel = React.createClass({
     this.setState({
       previousActiveIndex: null,
       direction: null
-    }, function() {
+    }, () => {
       this.waitForNext();
 
       if (this.props.onSlideEnd) {

src/Col.js

@@ -149,7 +149,7 @@ const Col = React.createClass({
     let ComponentClass = this.props.componentClass;
     let classes = {};
 
-    Object.keys(styleMaps.SIZES).forEach(function(key) {
+    Object.keys(styleMaps.SIZES).forEach( key => {
       let size = styleMaps.SIZES[key];
       let prop = size;
       let classPart = size + '-';

src/CollapsibleNav.js

@@ -44,9 +44,8 @@ const CollapsibleNav = React.createClass({
           { nav }
         </Collapse>
       );
-    } else {
-      return nav;
     }
+    return nav;
   },
 
   getChildActiveProp(child) {

src/DropdownButton.js

@@ -48,7 +48,7 @@ DropdownButton.propTypes = {
    */
   navItem: CustomPropTypes.all([
     React.PropTypes.bool,
-    function(props) {
+    props => {
       if (props.navItem) {
         deprecationWarning('navItem', 'NavDropdown component', 'https://github.com/react-bootstrap/react-bootstrap/issues/526');
       }

src/FadeMixin.js

@@ -6,7 +6,7 @@ import deprecationWarning from './utils/deprecationWarning';
 function getElementsAndSelf(root, classes) {
   let els = root.querySelectorAll('.' + classes.join('.'));
 
-  els = [].map.call(els, function(e) { return e; });
+  els = [].map.call(els, e => e );
 
   for (let i = 0; i < classes.length; i++) {
     if ( !root.className.match(new RegExp('\\b' + classes[i] + '\\b'))) {
@@ -29,7 +29,7 @@ export default {
       els = getElementsAndSelf(React.findDOMNode(this), ['fade']);
 
       if (els.length) {
-        els.forEach(function(el) {
+        els.forEach( el => {
           el.className += ' in';
         });
       }
@@ -40,7 +40,7 @@ export default {
     let els = getElementsAndSelf(this._fadeOutEl, ['fade', 'in']);
 
     if (els.length) {
-      els.forEach(function(el) {
+      els.forEach( el => {
         el.className = el.className.replace(/\bin\b/, '');
       });
     }

src/InputBase.js

@@ -14,12 +14,10 @@ class InputBase extends React.Component {
     } else if (this.props.type) {
       if (this.props.type === 'select' && this.props.multiple) {
         return this.getSelectedOptions();
-      } else {
-        return this.getInputDOMNode().value;
       }
-    } else {
-      throw new Error('Cannot use getValue without specifying input type.');
+      return this.getInputDOMNode().value;
     }
+    throw new Error('Cannot use getValue without specifying input type.');
   }
 
   getChecked() {

src/Interpolate.js

@@ -36,7 +36,7 @@ const Interpolate = React.createClass({
     delete props.unsafe;
 
     if (unsafe) {
-      let content = format.split(REGEXP).reduce(function(memo, match, index) {
+      let content = format.split(REGEXP).reduce((memo, match, index) => {
         let html;
 
         if (index % 2 === 0) {
@@ -58,28 +58,27 @@ const Interpolate = React.createClass({
       props.dangerouslySetInnerHTML = { __html: content };
 
       return React.createElement(parent, props);
-    } else {
-      let kids = format.split(REGEXP).reduce(function(memo, match, index) {
-        let child;
-
-        if (index % 2 === 0) {
-          if (match.length === 0) {
-            return memo;
-          }
+    }
+    let kids = format.split(REGEXP).reduce((memo, match, index) => {
+      let child;
 
-          child = match;
-        } else {
-          child = props[match];
-          delete props[match];
+      if (index % 2 === 0) {
+        if (match.length === 0) {
+          return memo;
         }
 
-        memo.push(child);
+        child = match;
+      } else {
+        child = props[match];
+        delete props[match];
+      }
 
-        return memo;
-      }, []);
+      memo.push(child);
 
-      return React.createElement(parent, props, kids);
-    }
+      return memo;
+    }, []);
+
+    return React.createElement(parent, props, kids);
   }
 });
 

src/ListGroup.js

@@ -23,9 +23,8 @@ class ListGroup extends React.Component {
 
     if (shouldRenderDiv) {
       return this.renderDiv(items);
-    } else {
-      return this.renderUL(items);
     }
+    return this.renderUL(items);
   }
 
   isAnchorOrButton(props) {

src/ListGroupItem.js

@@ -35,9 +35,8 @@ const ListGroupItem = React.createClass({
       return this.renderButton(classes);
     } else if (this.props.listItem) {
       return this.renderLi(classes);
-    } else {
-      return this.renderSpan(classes);
     }
+    return this.renderSpan(classes);
   },
 
   renderLi(classes) {

src/MenuItem.js

@@ -66,7 +66,7 @@ MenuItem.propTypes = {
   active: React.PropTypes.bool,
   divider: CustomPropTypes.all([
     React.PropTypes.bool,
-    function(props) {
+    props => {
       if (props.divider && props.children) {
         return new Error('Children will not be rendered for dividers');
       }

src/Modal.js

@@ -406,8 +406,8 @@ const Modal = React.createClass({
     // IOS only allows click events to be delegated to the document on elements
     // it considers 'clickable' - anchors, buttons, etc. We fake a click handler on the
     // DOM nodes themselves. Remove if handled by React: https://github.com/facebook/react/issues/1169
-    React.findDOMNode(this.refs.modal).onclick = function() {};
-    React.findDOMNode(this.refs.backdrop).onclick = function() {};
+    React.findDOMNode(this.refs.modal).onclick = () => {};
+    React.findDOMNode(this.refs.backdrop).onclick = () => {};
   },
 
   _getStyles() {

src/Panel.js

@@ -132,7 +132,7 @@ const Panel = React.createClass({
         addPanelBody(allChildren);
       }
     } else {
-      allChildren.forEach(function(child) {
+      allChildren.forEach( child => {
         if (this.shouldRenderFill(child)) {
           maybeRenderPanelBody();
 
@@ -141,7 +141,7 @@ const Panel = React.createClass({
         } else {
           panelBodyChildren.push(child);
         }
-      }.bind(this));
+      });
 
       maybeRenderPanelBody();
     }

src/SubNav.js

@@ -62,7 +62,7 @@ const SubNav = React.createClass({
 
       ValidComponentChildren.forEach(
         child.props.children,
-        function(grandchild) {
+        grandchild => {
           if (this.isChildActive(grandchild)) {
             isActive = true;
           }

src/TabbedArea.js

@@ -15,7 +15,7 @@ const TabbedArea = React.createClass({
   render() {
     const {children, ...props} = this.props;
 
-    const tabs = ValidComponentChildren.map(children, function(child) {
+    const tabs = ValidComponentChildren.map(children, child => {
       const {tab: title, ...others} = child.props;
       return <TabPane title={title} {...others} />;
     });

src/Tabs.js

@@ -17,7 +17,7 @@ let findChild = ValidComponentChildren.find;
 function getDefaultActiveKeyFromChildren(children) {
   let defaultActiveKey;
 
-  ValidComponentChildren.forEach(children, function(child) {
+  ValidComponentChildren.forEach(children, child => {
     if (defaultActiveKey == null) {
       defaultActiveKey = child.props.eventKey;
     }
@@ -218,27 +218,27 @@ const Tabs = React.createClass({
             {panes}
           </div>
         );
-      } else {
-        return (
-          <div {...containerProps}>
-            {panes}
-            {tabs}
-          </div>
-        );
       }
-    } else {
+
       return (
         <div {...containerProps}>
-          <Nav {...tabsProps}>
-            {childTabs}
-          </Nav>
-
-          <div {...panesProps}>
-            {childPanes}
-          </div>
+          {panes}
+          {tabs}
         </div>
       );
     }
+
+    return (
+      <div {...containerProps}>
+        <Nav {...tabsProps}>
+          {childTabs}
+        </Nav>
+
+        <div {...panesProps}>
+          {childPanes}
+        </div>
+      </div>
+    );
   },
 
   getActiveKey() {
@@ -299,7 +299,7 @@ const Tabs = React.createClass({
     let panesColProps;
     if (paneWidth == null) {
       panesColProps = {};
-      Object.keys(tabsColProps).forEach(function(size) {
+      Object.keys(tabsColProps).forEach( size => {
         panesColProps[size] = styleMaps.GRID_COLUMNS - tabsColProps[size];
       });
     } else if (paneWidth instanceof Object) {

src/Thumbnail.js

@@ -27,24 +27,24 @@ const Thumbnail = React.createClass({
           <img src={this.props.src} alt={this.props.alt} />
         </SafeAnchor>
       );
-    } else {
-      if (this.props.children) {
-        return (
-          <div {...this.props} className={classSet(this.props.className, classes)}>
-            <img src={this.props.src} alt={this.props.alt} />
-            <div className="caption">
-              {this.props.children}
-            </div>
-          </div>
-        );
-      } else {
-        return (
-          <div {...this.props} className={classSet(this.props.className, classes)}>
-            <img src={this.props.src} alt={this.props.alt} />
+    }
+
+    if (this.props.children) {
+      return (
+        <div {...this.props} className={classSet(this.props.className, classes)}>
+          <img src={this.props.src} alt={this.props.alt} />
+          <div className="caption">
+            {this.props.children}
           </div>
-        );
-      }
+        </div>
+      );
     }
+
+    return (
+      <div {...this.props} className={classSet(this.props.className, classes)}>
+        <img src={this.props.src} alt={this.props.alt} />
+      </div>
+    );
   }
 });