react-bootstrap
Advanced tools
Comparing version 0.14.0 to 0.14.1
@@ -30,4 +30,2 @@ var React = require('react'); | ||
render: function () { | ||
var className = 'dropdown-toggle'; | ||
var renderMethod = this.props.navItem ? | ||
@@ -43,3 +41,3 @@ 'renderNavItem' : 'renderButtonGroup'; | ||
{ref: "dropdownButton", | ||
className: joinClasses(this.props.className, className), | ||
className: "dropdown-toggle", | ||
onClick: this.handleDropdownClick, | ||
@@ -74,3 +72,3 @@ key: 0, | ||
bsSize: this.props.bsSize, | ||
className: classSet(groupClasses)}, | ||
className: joinClasses(this.props.className, classSet(groupClasses))}, | ||
children | ||
@@ -89,3 +87,3 @@ ) | ||
return ( | ||
React.createElement("li", {className: classSet(classes)}, | ||
React.createElement("li", {className: joinClasses(this.props.className, classSet(classes))}, | ||
children | ||
@@ -131,2 +129,2 @@ ) | ||
module.exports = DropdownButton; | ||
module.exports = DropdownButton; |
{ | ||
"name": "react-bootstrap", | ||
"version": "0.14.0", | ||
"version": "0.14.1", | ||
"description": "Bootstrap 3 components build with React", | ||
@@ -5,0 +5,0 @@ "homepage": "http://react-bootstrap.github.io/", |
20
Panel.js
@@ -86,2 +86,6 @@ var React = require('react'); | ||
function addPanelChild (child) { | ||
bodyElements.push(cloneWithProps(child, getProps())); | ||
} | ||
function addPanelBody (children) { | ||
@@ -97,3 +101,7 @@ bodyElements.push( | ||
if (!Array.isArray(allChildren) || allChildren.length == 0) { | ||
addPanelBody(allChildren); | ||
if (this.shouldRenderFill(allChildren)) { | ||
addPanelChild(allChildren); | ||
} else { | ||
addPanelBody(allChildren); | ||
} | ||
} else { | ||
@@ -112,11 +120,11 @@ var panelBodyChildren = []; | ||
allChildren.forEach(function(child) { | ||
if (React.isValidElement(child) && child.props.fill != null) { | ||
if (this.shouldRenderFill(child)) { | ||
maybeRenderPanelBody(); | ||
// Separately add the filled element. | ||
bodyElements.push(cloneWithProps(child, getProps())); | ||
addPanelChild(child); | ||
} else { | ||
panelBodyChildren.push(child); | ||
} | ||
}); | ||
}.bind(this)); | ||
@@ -129,2 +137,6 @@ maybeRenderPanelBody(); | ||
shouldRenderFill: function (child) { | ||
return React.isValidElement(child) && child.props.fill != null | ||
}, | ||
renderHeading: function () { | ||
@@ -131,0 +143,0 @@ var header = this.props.header; |
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
135258
4287