Skip to content

Commit d2bcc8e

Browse files
committed
Merge pull request react-bootstrap#1429 from michaeljones/buttons
Remove cross import between Button & ButtonInput
2 parents f9bcac1 + 6e37b27 commit d2bcc8e

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

src/Button.js

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@ import React from 'react';
22
import classNames from 'classnames';
33
import BootstrapMixin from './BootstrapMixin';
44
import elementType from 'react-prop-types/lib/elementType';
5-
import ButtonInput from './ButtonInput';
5+
6+
const types = ['button', 'reset', 'submit'];
67

78
const Button = React.createClass({
89
mixins: [BootstrapMixin],
@@ -24,7 +25,7 @@ const Button = React.createClass({
2425
* @type {("button"|"reset"|"submit")}
2526
* @defaultValue 'button'
2627
*/
27-
type: React.PropTypes.oneOf(ButtonInput.types)
28+
type: React.PropTypes.oneOf(types)
2829
},
2930

3031
getDefaultProps() {
@@ -101,4 +102,6 @@ const Button = React.createClass({
101102
}
102103
});
103104

105+
Button.types = types;
106+
104107
export default Button;

src/ButtonInput.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ class ButtonInput extends InputBase {
1717
}
1818
}
1919

20-
ButtonInput.types = ['button', 'reset', 'submit'];
20+
ButtonInput.types = Button.types;
2121

2222
ButtonInput.defaultProps = {
2323
type: 'button'

0 commit comments

Comments
 (0)