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

Left `Airbnb` rules.

Author: AlexKVal

.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/, '');
       });
     }