Merge pull request react-bootstrap#1230 from AlexKVal/airbnb-additional

taion · taion · commit 47cb2d6bfa7d · 2015-08-27T11:13:59.000-04:00
Impose 'brace-style' 'default-case' and 'ident' rules
diff --git a/.eslintrc b/.eslintrc
@@ -13,15 +13,12 @@
     "babel"
   ],
   "rules": {
-    "brace-style": 0,
     "constructor-super": 2,
     "comma-dangle": 0,
     "comma-spacing": 2,
     "comma-style": [2, "last"],
-    "default-case": 0,
     "func-names": 0,
     "guard-for-in": 0,
-    "indent": 0,
     "one-var": [2, { "initialized": "never" }],
     "padded-blocks": 0,
     "prefer-const": 0,
diff --git a/docs/examples/ButtonInput.js b/docs/examples/ButtonInput.js
@@ -17,8 +17,8 @@ const ButtonInputExample = React.createClass({
     let length = this.refs.input.getValue().length;
     let style = 'danger';
 
-    if (length > 10) { style = 'success'; }
-    else if (length > 5) { style = 'warning'; }
+    if (length > 10) style = 'success';
+    else if (length > 5) style = 'warning';
 
     let disabled = style !== 'success';
 
diff --git a/docs/examples/Input.js b/docs/examples/Input.js
@@ -7,9 +7,9 @@ const ExampleInput = React.createClass({
 
   validationState() {
     let length = this.state.value.length;
-    if (length > 10) { return 'success'; }
-    else if (length > 5) { return 'warning'; }
-    else if (length > 0) { return 'error'; }
+    if (length > 10) return 'success';
+    else if (length > 5) return 'warning';
+    else if (length > 0) return 'error';
   },
 
   handleChange() {
diff --git a/docs/src/PropTable.js b/docs/src/PropTable.js
@@ -146,28 +146,28 @@ const PropTable = React.createClass({
     let doclets = prop.doclets || {};
 
     switch (name) {
-      case 'object':
-        return name;
-      case 'union':
-        return type.value.reduce((current, val, i, list) => {
-          let item = this.getType({ type: val });
-          if (React.isValidElement(item)) {
-            item = React.cloneElement(item, {key: i});
-          }
-          current = current.concat(item);
-
-          return i === (list.length - 1) ? current : current.concat(' | ');
-        }, []);
-      case 'array':
-        let child = this.getType({ type: type.value });
-
-        return <span>{'array<'}{ child }{'>'}</span>;
-      case 'enum':
-        return this.renderEnum(type);
-      case 'custom':
-        return cleanDocletValue(doclets.type || name);
-      default:
-        return name;
+    case 'object':
+      return name;
+    case 'union':
+      return type.value.reduce((current, val, i, list) => {
+        let item = this.getType({ type: val });
+        if (React.isValidElement(item)) {
+          item = React.cloneElement(item, {key: i});
+        }
+        current = current.concat(item);
+
+        return i === (list.length - 1) ? current : current.concat(' | ');
+      }, []);
+    case 'array':
+      let child = this.getType({ type: type.value });
+
+      return <span>{'array<'}{ child }{'>'}</span>;
+    case 'enum':
+      return this.renderEnum(type);
+    case 'custom':
+      return cleanDocletValue(doclets.type || name);
+    default:
+      return name;
     }
   },
 
diff --git a/src/AffixMixin.js b/src/AffixMixin.js
@@ -30,7 +30,7 @@ const AffixMixin = {
 
   checkPosition() {
     let DOMNode, scrollHeight, scrollTop, position, offsetTop, offsetBottom,
-        affix, affixType, affixPositionTop;
+      affix, affixType, affixPositionTop;
 
     // TODO: or not visible
     if (!this.isMounted()) {
diff --git a/src/Carousel.js b/src/Carousel.js
@@ -249,18 +249,18 @@ const Carousel = React.createClass({
             this.state.previousActiveIndex === index && this.props.slide;
 
     return cloneElement(
-        child,
-        {
-          active: isActive,
-          ref: child.ref,
-          key: child.key ? child.key : index,
-          index,
-          animateOut: isPreviousActive,
-          animateIn: isActive && this.state.previousActiveIndex != null && this.props.slide,
-          direction: this.state.direction,
-          onAnimateOutEnd: isPreviousActive ? this.handleItemAnimateOutEnd : null
-        }
-      );
+      child,
+      {
+        active: isActive,
+        ref: child.ref,
+        key: child.key ? child.key : index,
+        index,
+        animateOut: isPreviousActive,
+        animateIn: isActive && this.state.previousActiveIndex != null && this.props.slide,
+        direction: this.state.direction,
+        onAnimateOutEnd: isPreviousActive ? this.handleItemAnimateOutEnd : null
+      }
+    );
   },
 
   handleSelect(index, direction) {
diff --git a/src/Dropdown.js b/src/Dropdown.js
@@ -105,21 +105,21 @@ class Dropdown extends React.Component {
     };
 
     switch(event.keyCode) {
-      case keycode.codes.down:
-        if (!this.props.open) {
-          this.toggleOpen();
-        }
-        else {
-          focusNext();
-        }
-        event.preventDefault();
-        break;
-      case keycode.codes.esc:
-      case keycode.codes.tab:
-        if (this.props.open) {
-          this.handleClose(event);
-        }
-        break;
+    case keycode.codes.down:
+      if (!this.props.open) {
+        this.toggleOpen();
+      } else {
+        focusNext();
+      }
+      event.preventDefault();
+      break;
+    case keycode.codes.esc:
+    case keycode.codes.tab:
+      if (this.props.open) {
+        this.handleClose(event);
+      }
+      break;
+    default:
     }
   }
 
@@ -133,8 +133,7 @@ class Dropdown extends React.Component {
     // to the next focusable input
     if (event && event.keyCode === keycode.codes.tab){
       setTimeout(this.toggleOpen);
-    }
-    else {
+    } else {
       this.toggleOpen();
     }
 
diff --git a/src/DropdownMenu.js b/src/DropdownMenu.js
@@ -20,18 +20,19 @@ class DropdownMenu extends React.Component {
   handleKeyDown(event) {
 
     switch(event.keyCode) {
-      case keycode.codes.down:
-        this.focusNext();
-        event.preventDefault();
-        break;
-      case keycode.codes.up:
-        this.focusPrevious();
-        event.preventDefault();
-        break;
-      case keycode.codes.esc:
-      case keycode.codes.tab:
-        this.props.onClose(event);
-        break;
+    case keycode.codes.down:
+      this.focusNext();
+      event.preventDefault();
+      break;
+    case keycode.codes.up:
+      this.focusPrevious();
+      event.preventDefault();
+      break;
+    case keycode.codes.esc:
+    case keycode.codes.tab:
+      this.props.onClose(event);
+      break;
+    default:
     }
   }
 
diff --git a/src/InputBase.js b/src/InputBase.js
@@ -76,8 +76,9 @@ class InputBase extends React.Component {
 
     let inputGroupClassName;
     switch (this.props.bsSize) {
-      case 'small': inputGroupClassName = 'input-group-sm'; break;
-      case 'large': inputGroupClassName = 'input-group-lg'; break;
+    case 'small': inputGroupClassName = 'input-group-sm'; break;
+    case 'large': inputGroupClassName = 'input-group-lg'; break;
+    default:
     }
 
     return addonBefore || addonAfter || buttonBefore || buttonAfter ? (
@@ -98,10 +99,10 @@ class InputBase extends React.Component {
       }
 
       switch (this.props.bsStyle) {
-        case 'success': return <Glyphicon formControlFeedback glyph="ok" key="icon" />;
-        case 'warning': return <Glyphicon formControlFeedback glyph="warning-sign" key="icon" />;
-        case 'error': return <Glyphicon formControlFeedback glyph="remove" key="icon" />;
-        default: return <span className="form-control-feedback" key="icon" />;
+      case 'success': return <Glyphicon formControlFeedback glyph="ok" key="icon" />;
+      case 'warning': return <Glyphicon formControlFeedback glyph="warning-sign" key="icon" />;
+      case 'error': return <Glyphicon formControlFeedback glyph="remove" key="icon" />;
+      default: return <span className="form-control-feedback" key="icon" />;
       }
     } else {
       return null;
@@ -157,24 +158,24 @@ class InputBase extends React.Component {
     }
 
     switch (this.props.type) {
-      case 'select':
-        return (
-          <select {...this.props} className={classNames(this.props.className, 'form-control')} ref="input" key="input">
-            {this.props.children}
-          </select>
-        );
-      case 'textarea':
-        return <textarea {...this.props} className={classNames(this.props.className, 'form-control')} ref="input" key="input" />;
-      case 'static':
-        return (
-          <p {...this.props} className={classNames(this.props.className, 'form-control-static')} ref="input" key="input">
-            {this.props.value}
-          </p>
-        );
+    case 'select':
+      return (
+        <select {...this.props} className={classNames(this.props.className, 'form-control')} ref="input" key="input">
+          {this.props.children}
+        </select>
+      );
+    case 'textarea':
+      return <textarea {...this.props} className={classNames(this.props.className, 'form-control')} ref="input" key="input" />;
+    case 'static':
+      return (
+        <p {...this.props} className={classNames(this.props.className, 'form-control-static')} ref="input" key="input">
+          {this.props.value}
+        </p>
+      );
+    default:
+      const className = this.isCheckboxOrRadio() || this.isFile() ? '' : 'form-control';
+      return <input {...this.props} className={classNames(this.props.className, className)} ref="input" key="input" />;
     }
-
-    let className = this.isCheckboxOrRadio() || this.isFile() ? '' : 'form-control';
-    return <input {...this.props} className={classNames(this.props.className, className)} ref="input" key="input" />;
   }
 
   renderFormGroup(children) {
diff --git a/src/NavItem.js b/src/NavItem.js
@@ -39,17 +39,17 @@ const NavItem = React.createClass({
         'aria-controls': ariaControls,
         ...props } = this.props;
     let classes = {
-          active,
-          disabled
-        };
+      active,
+      disabled
+    };
     let linkProps = {
-          role,
-          href,
-          title,
-          target,
-          id: linkId,
-          onClick: this.handleClick
-        };
+      role,
+      href,
+      title,
+      target,
+      id: linkId,
+      onClick: this.handleClick
+    };
 
     if (!role && href === '#') {
       linkProps.role = 'button';
diff --git a/src/Navbar.js b/src/Navbar.js
@@ -139,7 +139,7 @@ const Navbar = React.createClass({
         <span className="icon-bar" key={1}></span>,
         <span className="icon-bar" key={2}></span>,
         <span className="icon-bar" key={3}></span>
-    ];
+      ];
 
     return (
       <button className="navbar-toggle" type="button" onClick={this.handleToggle}>
diff --git a/src/Overlay.js b/src/Overlay.js
@@ -56,8 +56,8 @@ Overlay.propTypes = {
    * Use animation
    */
   animation: React.PropTypes.oneOfType([
-      React.PropTypes.bool,
-      CustomPropTypes.elementType
+    React.PropTypes.bool,
+    CustomPropTypes.elementType
   ]),
 
   /**
diff --git a/src/SplitButton.js b/src/SplitButton.js
@@ -17,7 +17,7 @@ class SplitButton extends React.Component {
       bsStyle, // eslint-disable-line
       ...props } = this.props;
 
-     let { disabled } = props;
+    let { disabled } = props;
 
     let button = (
       <Button
diff --git a/src/Tabs.js b/src/Tabs.js
@@ -205,16 +205,16 @@ const Tabs = React.createClass({
     let paneIsAlreadyActive = previousActiveKey != null && child.props.eventKey === previousActiveKey;
 
     return cloneElement(
-        child,
-        {
-          active: shouldPaneBeSetActive && (thereIsNoActivePane || !this.props.animation),
-          id: paneId(this.props, child),
-          'aria-labelledby': tabId(this.props, child),
-          key: child.key ? child.key : index,
-          animation: this.props.animation,
-          onAnimateOutEnd: paneIsAlreadyActive ? this.handlePaneAnimateOutEnd : null
-        }
-      );
+      child,
+      {
+        active: shouldPaneBeSetActive && (thereIsNoActivePane || !this.props.animation),
+        id: paneId(this.props, child),
+        'aria-labelledby': tabId(this.props, child),
+        key: child.key ? child.key : index,
+        animation: this.props.animation,
+        onAnimateOutEnd: paneIsAlreadyActive ? this.handlePaneAnimateOutEnd : null
+      }
+    );
   },
 
   renderTab(child) {
diff --git a/src/Thumbnail.js b/src/Thumbnail.js
@@ -27,8 +27,7 @@ const Thumbnail = React.createClass({
           <img src={this.props.src} alt={this.props.alt} />
         </SafeAnchor>
       );
-    }
-    else {
+    } else {
       if(this.props.children) {
         return (
           <div {...this.props} className={classSet(this.props.className, classes)}>
@@ -38,8 +37,7 @@ const Thumbnail = React.createClass({
             </div>
           </div>
         );
-      }
-      else {
+      } else {
         return (
           <div {...this.props} className={classSet(this.props.className, classes)}>
             <img src={this.props.src} alt={this.props.alt} />
diff --git a/src/utils/deprecationWarning.js b/src/utils/deprecationWarning.js
@@ -7,8 +7,7 @@ function deprecationWarning(oldname, newname, link) {
 
   if (typeof oldname === 'object'){
     message = oldname.message;
-  }
-  else {
+  } else {
     message = `${oldname} is deprecated. Use ${newname} instead.`;
 
     if (link) {
@@ -38,4 +37,3 @@ deprecationWarning.wrapper = function(Component, ...args){
 };
 
 export default deprecationWarning;
-
diff --git a/test/GlyphiconSpec.js b/test/GlyphiconSpec.js
diff --git a/test/ThumbnailSpec.js b/test/ThumbnailSpec.js
diff --git a/tools/build.js b/tools/build.js
diff --git a/tools/fs-utils.js b/tools/fs-utils.js
