diff --git a/components/button/Button.jsx b/components/button/Button.jsx index 9f470625..ff4f25ec 100644 --- a/components/button/Button.jsx +++ b/components/button/Button.jsx @@ -18,7 +18,6 @@ class Button extends React.Component { icon: React.PropTypes.string, inverse: React.PropTypes.bool, label: React.PropTypes.string, - loading: React.PropTypes.bool, mini: React.PropTypes.bool, primary: React.PropTypes.bool, raised: React.PropTypes.bool, @@ -33,7 +32,6 @@ class Button extends React.Component { className: '', flat: false, floating: false, - loading: false, mini: false, primary: false, raised: false, @@ -48,7 +46,7 @@ class Button extends React.Component { render () { const {accent, className, flat, floating, href, icon, inverse, label, - loading, mini, primary, raised, ripple, + mini, primary, raised, ripple, tooltip, tooltipDelay, ...others} = this.props; const element = href ? 'a' : 'button'; const level = primary ? 'primary' : accent ? 'accent' : 'neutral'; @@ -63,13 +61,13 @@ class Button extends React.Component { ...others, href, className: classes, - disabled: this.props.disabled || this.props.loading, + disabled: this.props.disabled, onMouseDown: this.handleMouseDown, 'data-react-toolbox': 'button' }; return React.createElement(element, props, - ripple ? : null, + ripple ? : null, tooltip ? : null, icon ? : null, label ? label : this.props.children diff --git a/components/button/readme.md b/components/button/readme.md index 82dc9a87..d59ad5fa 100644 --- a/components/button/readme.md +++ b/components/button/readme.md @@ -42,7 +42,6 @@ const TestButtons = () => ( | `icon` | `String` | | Value of the icon (See icon component). | | `inverse` | `Boolean` | | If true, the neutral colors are inverted. Useful to put a button over a dark background. | | `label` | `String` | | The text string to use for the name of the button.| -| `loading` | `Boolean` | `false` | If true, component will be disabled and show a loading animation.| | `mini` | `Boolean` | `false` | To be used with floating button. If true the button will be smaller.| | `primary` | `false` | `false` | Indicates if the button should have primary color.| | `raised` | `Boolean` | `false` | If true, the button will have a raised look. | diff --git a/spec/components/button.jsx b/spec/components/button.jsx index 23641ca0..0b881a92 100644 --- a/spec/components/button.jsx +++ b/spec/components/button.jsx @@ -26,7 +26,6 @@ const ButtonTest = () => (