Merge pull request #432 from mmrtnz/master

Gave disabled prop priority when determining button styles.
mui · Mar 16, 2015 · 60eda20 · 60eda20
2 parents aacfbc1 + 591ff75
commit 60eda20
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/src/js/flat-button.jsx b/src/js/flat-button.jsx
@@ -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;
 

diff --git a/src/js/floating-action-button.jsx b/src/js/floating-action-button.jsx
@@ -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;

diff --git a/src/js/raised-button.jsx b/src/js/raised-button.jsx
@@ -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;