Merge pull request react-bootstrap#832 from AlexKVal/commaStyle

Impose comma and one-var styles.
tomlelouch · Jun 15, 2015 · 9352546 · 9352546
2 parents d49ce21 + 55802fd
commit 9352546
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 25 deletions.
diff --git a/.eslintrc b/.eslintrc
@@ -12,6 +12,8 @@
   ],
   "rules": {
     "comma-spacing": 2,
+    "comma-style": [2, "last"],
+    "one-var": [2, { "initialized": "never" }],
     "key-spacing": 0,
     "no-underscore-dangle": 0,
     "no-unused-vars": [2, { "vars": "all", "args": "none" }],

diff --git a/docs/src/ComponentsPage.js b/docs/src/ComponentsPage.js
@@ -30,11 +30,11 @@ const ComponentsPage = React.createClass({
   },
 
   componentDidMount() {
-    let elem = React.findDOMNode(this.refs.sideNav),
-        domUtils = Affix.domUtils,
-        sideNavOffsetTop = domUtils.getOffset(elem).top,
-        sideNavMarginTop = parseInt(domUtils.getComputedStyles(elem.firstChild).marginTop, 10),
-        topNavHeight = React.findDOMNode(this.refs.topNav).offsetHeight;
+    let elem = React.findDOMNode(this.refs.sideNav);
+    let domUtils = Affix.domUtils;
+    let sideNavOffsetTop = domUtils.getOffset(elem).top;
+    let sideNavMarginTop = parseInt(domUtils.getComputedStyles(elem.firstChild).marginTop, 10);
+    let topNavHeight = React.findDOMNode(this.refs.topNav).offsetHeight;
 
     this.setState({
       navOffsetTop: sideNavOffsetTop - topNavHeight - sideNavMarginTop,

diff --git a/src/CollapsibleNav.js b/src/CollapsibleNav.js
@@ -29,9 +29,9 @@ const CollapsibleNav = React.createClass({
     for (let key in nodes) {
       if (nodes.hasOwnProperty(key)) {
 
-        let n = React.findDOMNode(nodes[key])
-          , h = n.offsetHeight
-          , computedStyles = domUtils.getComputedStyles(n);
+        let n = React.findDOMNode(nodes[key]);
+        let h = n.offsetHeight;
+        let computedStyles = domUtils.getComputedStyles(n);
 
         height += (h +
           parseInt(computedStyles.marginTop, 10) +

diff --git a/src/FadeMixin.js b/src/FadeMixin.js
@@ -57,8 +57,8 @@ export default {
   },
 
   componentWillUnmount() {
-    let els = getElementsAndSelf(React.findDOMNode(this), ['fade']),
-        container = (this.props.container && React.findDOMNode(this.props.container)) ||
+    let els = getElementsAndSelf(React.findDOMNode(this), ['fade']);
+    let container = (this.props.container && React.findDOMNode(this.props.container)) ||
           domUtils.ownerDocument(this).body;
 
     if (els.length) {

diff --git a/src/Nav.js b/src/Nav.js
@@ -36,9 +36,9 @@ const Nav = React.createClass({
   },
 
   getCollapsibleDimensionValue() {
-    let node = React.findDOMNode(this.refs.ul),
-        height = node.offsetHeight,
-        computedStyles = domUtils.getComputedStyles(node);
+    let node = React.findDOMNode(this.refs.ul);
+    let height = node.offsetHeight;
+    let computedStyles = domUtils.getComputedStyles(node);
 
     return height + parseInt(computedStyles.marginTop, 10) + parseInt(computedStyles.marginBottom, 10);
   },

diff --git a/test/PanelSpec.js b/test/PanelSpec.js
@@ -36,21 +36,21 @@ describe('Panel', function () {
   });
 
   it('Should have custom component header', function () {
-    let header = <h3>Heading</h3>,
-        instance = ReactTestUtils.renderIntoDocument(
-          <Panel header={header}>Panel content</Panel>
-        );
+    let header = <h3>Heading</h3>;
+    let instance = ReactTestUtils.renderIntoDocument(
+      <Panel header={header}>Panel content</Panel>
+    );
     header = React.findDOMNode(ReactTestUtils.findRenderedDOMComponentWithClass(instance, 'panel-heading'));
     assert.equal(header.firstChild.nodeName, 'H3');
     assert.ok(header.firstChild.className.match(/\bpanel-title\b/));
     assert.equal(header.firstChild.innerHTML, 'Heading');
   });
 
   it('Should have custom component header with anchor', function () {
-    let header = <h3>Heading</h3>,
-        instance = ReactTestUtils.renderIntoDocument(
-          <Panel header={header} collapsible={true}>Panel content</Panel>
-        );
+    let header = <h3>Heading</h3>;
+    let instance = ReactTestUtils.renderIntoDocument(
+      <Panel header={header} collapsible={true}>Panel content</Panel>
+    );
     header = React.findDOMNode(ReactTestUtils.findRenderedDOMComponentWithClass(instance, 'panel-heading'));
     assert.equal(header.firstChild.nodeName, 'H3');
     assert.ok(header.firstChild.className.match(/\bpanel-title\b/));
@@ -59,10 +59,10 @@ describe('Panel', function () {
   });
 
   it('Should have custom component header with custom class', function () {
-    let header = <h3 className="custom-class">Heading</h3>,
-        instance = ReactTestUtils.renderIntoDocument(
-          <Panel header={header}>Panel content</Panel>
-        );
+    let header = <h3 className="custom-class">Heading</h3>;
+    let instance = ReactTestUtils.renderIntoDocument(
+      <Panel header={header}>Panel content</Panel>
+    );
     header = React.findDOMNode(ReactTestUtils.findRenderedDOMComponentWithClass(instance, 'panel-heading'));
     assert.equal(header.firstChild.nodeName, 'H3');
     assert.ok(header.firstChild.className.match(/\bpanel-title\b/));