Impose 'no-else-return' airbnb rule

Author: AlexKVal

.eslintrc

@@ -21,7 +21,6 @@
     "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/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) {

src/CollapsibleNav.js

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

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

@@ -58,28 +58,27 @@ const Interpolate = React.createClass({
       props.dangerouslySetInnerHTML = { __html: content };
 
       return React.createElement(parent, props);
-    } else {
-      let kids = format.split(REGEXP).reduce((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/Tabs.js

@@ -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() {

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>
+    );
   }
 });
 

test/OverlayTriggerSpec.js

@@ -233,15 +233,15 @@ describe('OverlayTrigger', () => {
               return (
                 <div>replaced</div>
               );
-            } else {
-              return (
-                <div>
-                  <a id="replace-overlay" onClick={this.handleClick}>
-                    original
-                  </a>
-                </div>
-              );
             }
+
+            return (
+              <div>
+                <a id="replace-overlay" onClick={this.handleClick}>
+                  original
+                </a>
+              </div>
+            );
           }
         }