Skip to content

Commit 047b723

Browse files
committed
Move className prop to outer-most element in dropdown
fixes react-bootstrap#375
1 parent 85ef74b commit 047b723

1 file changed

Lines changed: 4 additions & 6 deletions

File tree

src/DropdownButton.jsx

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,6 @@ var DropdownButton = React.createClass({
2727
},
2828

2929
render: function () {
30-
var className = 'dropdown-toggle';
31-
3230
var renderMethod = this.props.navItem ?
3331
'renderNavItem' : 'renderButtonGroup';
3432

@@ -39,7 +37,7 @@ var DropdownButton = React.createClass({
3937
<Button
4038
{...this.props}
4139
ref="dropdownButton"
42-
className={joinClasses(this.props.className, className)}
40+
className="dropdown-toggle"
4341
onClick={this.handleDropdownClick}
4442
key={0}
4543
navDropdown={this.props.navItem}
@@ -69,7 +67,7 @@ var DropdownButton = React.createClass({
6967
return (
7068
<ButtonGroup
7169
bsSize={this.props.bsSize}
72-
className={classSet(groupClasses)}>
70+
className={joinClasses(this.props.className, classSet(groupClasses))}>
7371
{children}
7472
</ButtonGroup>
7573
);
@@ -83,7 +81,7 @@ var DropdownButton = React.createClass({
8381
};
8482

8583
return (
86-
<li className={classSet(classes)}>
84+
<li className={joinClasses(this.props.className, classSet(classes))}>
8785
{children}
8886
</li>
8987
);
@@ -124,4 +122,4 @@ var DropdownButton = React.createClass({
124122
}
125123
});
126124

127-
module.exports = DropdownButton;
125+
module.exports = DropdownButton;

0 commit comments

Comments
 (0)