Merge remote-tracking branch 'origin/master' into pr576

Conflicts:
	tools/build.js

Author: mtscout6

src/ListGroup.js

@@ -16,14 +16,15 @@ class ListGroup extends React.Component {
     } else if (React.Children.count(this.props.children) === 1 && !Array.isArray(this.props.children)) {
       let child = this.props.children;
 
-      childrenAnchors = child.props.href ? true : false;
+      childrenAnchors = this.isAnchor(child.props);
 
     } else {
 
       childrenAnchors = Array.prototype.some.call(this.props.children, (child) => {
-        return !Array.isArray(child) ? child.props.href : Array.prototype.some.call(child, (subChild) => {
-            return subChild.props.href;
+        return !Array.isArray(child) ? this.isAnchor(child.props) : Array.prototype.some.call(child, (subChild) => {
+            return this.isAnchor(subChild.props);
         });
+
       });
 
     }
@@ -35,6 +36,10 @@ class ListGroup extends React.Component {
     }
   }
 
+  isAnchor(props){
+    return (props.href || props.onClick);
+  }
+
   renderUL(items) {
     let listItems = ValidComponentChildren.map(items,
       (item, index) => cloneElement(item, { listItem: true })

src/ListGroupItem.js

@@ -31,7 +31,7 @@ const ListGroupItem = React.createClass({
     classes.active = this.props.active;
     classes.disabled = this.props.disabled;
 
-    if (this.props.href || this.props.target || this.props.onClick) {
+    if (this.props.href || this.props.onClick) {
       return this.renderAnchor(classes);
     } else if (this.props.listItem) {
       return this.renderLi(classes);

src/TabbedArea.js

@@ -40,9 +40,6 @@ const TabbedArea = React.createClass({
     let defaultActiveKey = this.props.defaultActiveKey != null ?
       this.props.defaultActiveKey : getDefaultActiveKeyFromChildren(this.props.children);
 
-    // TODO: In __DEV__ mode warn via `console.warn` if no `defaultActiveKey` has
-    // been set by this point, invalid children or missing key properties are likely the cause.
-
     return {
       activeKey: defaultActiveKey,
       previousActiveKey: null

test/CollapsableNavSpec.jsx test/CollapsableNavSpec.jstest/CollapsableNavSpec.jsx renamed to test/CollapsableNavSpec.js

@@ -1,9 +1,9 @@
 import React from 'react';
 import ReactTestUtils from 'react/lib/ReactTestUtils';
-import Navbar from '../lib/Navbar';
-import CollapsableNav from '../lib/CollapsableNav';
-import Nav from '../lib/Nav';
-import NavItem from '../lib/NavItem';
+import Navbar from '../src/Navbar';
+import CollapsableNav from '../src/CollapsableNav';
+import Nav from '../src/Nav';
+import NavItem from '../src/NavItem';
 
 describe('CollapsableNav', function () {
   it('Should create div and add collapse class', function () {

test/ListGroupSpec.js

@@ -120,4 +120,20 @@ describe('ListGroup', function () {
     assert.equal(React.findDOMNode(instance).lastChild.nodeName, 'SPAN');
     assert.ok(ReactTestUtils.findRenderedDOMComponentWithClass(instance, 'list-group'));
   });
+
+
+
+  it('Should output a "div" when "ListGroupItem" children have an onClick handler', function () {
+    let instance = ReactTestUtils.renderIntoDocument(
+      <ListGroup>
+        <ListGroupItem onClick={() => null}>1st Child</ListGroupItem>
+        <ListGroupItem>2nd Child</ListGroupItem>
+      </ListGroup>
+    );
+    assert.equal(React.findDOMNode(instance).nodeName, 'DIV');
+    assert.equal(React.findDOMNode(instance).firstChild.nodeName, 'A');
+    assert.equal(React.findDOMNode(instance).lastChild.nodeName, 'SPAN');
+    assert.ok(ReactTestUtils.findRenderedDOMComponentWithClass(instance, 'list-group'));
+  });
+
 });

tools/build.js

@@ -6,8 +6,8 @@ import lib from './lib/build';
 import docs from '../docs/build';
 import dist from './dist/build';
 import { copy } from './fs-utils';
-import { setExecOptions } from './exec';
 import { distRoot, bowerRoot } from './constants';
+import { exec, setExecOptions } from './exec';
 
 import yargs from 'yargs';
 
@@ -33,7 +33,7 @@ export default function Build(noExitOnFailure) {
       lib(),
       bower(),
       dist(),
-      docs()
+      exec(`npm run docs-build`)
     ])
     .then(() => copy(distRoot, bowerRoot));