Merge branch 'master' into react-14

Author: taion

CHANGELOG.md

@@ -1,3 +1,11 @@
+v0.24.5 - Fri, 14 Aug 2015 18:02:13 GMT
+---------------------------------------
+
+- [dc2a07a](../../commit/dc2a07a) [fixed] Collapse exported as Fade
+- [f53bcf5](../../commit/f53bcf5) [fixed] 'bsSize' and 'bsStyle' properties has been removed from 'Glyphicon'
+
+
+
 v0.24.4 - Mon, 10 Aug 2015 19:33:35 GMT
 ---------------------------------------
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-bootstrap",
-  "version": "0.24.4",
+  "version": "0.24.5",
   "description": "Bootstrap 3 components build with React",
   "repository": {
     "type": "git",

src/Badge.js

@@ -8,6 +8,12 @@ const Badge = React.createClass({
     pullRight: React.PropTypes.bool
   },
 
+  getDefaultProps() {
+    return {
+      pullRight: false
+    };
+  },
+
   hasContent() {
     return ValidComponentChildren.hasValidComponent(this.props.children) ||
       (React.Children.count(this.props.children) > 1) ||

src/Button.js

@@ -28,8 +28,13 @@ const Button = React.createClass({
 
   getDefaultProps() {
     return {
+      active: false,
+      block: false,
       bsClass: 'button',
-      bsStyle: 'default'
+      bsStyle: 'default',
+      disabled: false,
+      navItem: false,
+      navDropdown: false
     };
   },
 

src/ButtonGroup.js

@@ -25,7 +25,10 @@ const ButtonGroup = React.createClass({
 
   getDefaultProps() {
     return {
-      bsClass: 'button-group'
+      block: false,
+      bsClass: 'button-group',
+      justified: false,
+      vertical: false
     };
   },
 

src/CarouselItem.js

@@ -23,7 +23,9 @@ const CarouselItem = React.createClass({
 
   getDefaultProps() {
     return {
-      animation: true
+      active: false,
+      animateIn: false,
+      animateOut: false
     };
   },
 

src/CollapsibleNav.js

@@ -18,6 +18,12 @@ const CollapsibleNav = React.createClass({
     eventKey: React.PropTypes.any
   },
 
+  getDefaultProps() {
+    return {
+      collapsible: false,
+      expanded: false
+    };
+  },
 
   render() {
     /*

src/DropdownButton.js

@@ -30,6 +30,15 @@ const DropdownButton = React.createClass({
     children:  React.PropTypes.node
   },
 
+  getDefaultProps() {
+    return {
+      pullRight: false,
+      dropup: false,
+      navItem: false,
+      noCaret: false
+    };
+  },
+
   render() {
     let renderMethod = this.props.navItem ?
       'renderNavItem' : 'renderButtonGroup';

src/DropdownMenu.js

@@ -10,6 +10,12 @@ const DropdownMenu = React.createClass({
     onSelect: React.PropTypes.func
   },
 
+  getDefaultProps() {
+    return {
+      pullRight: false
+    };
+  },
+
   render() {
     let classes = {
         'dropdown-menu': true,

src/FormGroup.js

@@ -22,6 +22,7 @@ class FormGroup extends React.Component {
 }
 
 FormGroup.defaultProps = {
+  hasFeedback: false,
   standalone: false
 };