Skip to content

Commit

Permalink
Gave disabled prop priority when determining button styles.
Browse files Browse the repository at this point in the history
  • Loading branch information
mmrtnz committed Mar 16, 2015
1 parent aacfbc1 commit 591ff75
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions src/js/flat-button.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ var FlatButton = React.createClass({
...other
} = this.props;
var classes = this.getClasses('mui-flat-button', {
'mui-is-primary': primary,
'mui-is-secondary': !primary && secondary
'mui-is-primary': !this.props.disabled && primary,
'mui-is-secondary': !this.props.disabled && !primary && secondary
});
var children;

Expand Down
2 changes: 1 addition & 1 deletion src/js/floating-action-button.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ var RaisedButton = React.createClass({
...other } = this.props;
var classes = this.getClasses('mui-floating-action-button', {
'mui-is-mini': mini,
'mui-is-secondary': secondary
'mui-is-secondary': !this.props.disabled && secondary
});

var icon;
Expand Down
4 changes: 2 additions & 2 deletions src/js/raised-button.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@ var RaisedButton = React.createClass({
secondary,
...other } = this.props;
var classes = this.getClasses('mui-raised-button', {
'mui-is-primary': primary,
'mui-is-secondary': !primary && secondary
'mui-is-primary': !this.props.disabled && primary,
'mui-is-secondary': !this.props.disabled && !primary && secondary
});
var children;

Expand Down

0 comments on commit 591ff75

Please sign in to comment.