Skip to content

Commit

Permalink
Merge pull request react-bootstrap#505 from AlexKVal/lnt_src2
Browse files Browse the repository at this point in the history
[fixed] Missed propTypes validations for SplitButton, Input, TabPane, CarouselItem
  • Loading branch information
mtscout6 committed Apr 10, 2015
2 parents ba7e7c4 + f3ae67e commit 5ce17e9
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 4 deletions.
5 changes: 4 additions & 1 deletion src/CarouselItem.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,10 @@ const CarouselItem = React.createClass({
direction: React.PropTypes.oneOf(['prev', 'next']),
onAnimateOutEnd: React.PropTypes.func,
active: React.PropTypes.bool,
caption: React.PropTypes.node
animateIn: React.PropTypes.bool,
animateOut: React.PropTypes.bool,
caption: React.PropTypes.node,
index: React.PropTypes.number
},

getInitialState() {
Expand Down
4 changes: 3 additions & 1 deletion src/Input.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,9 @@ const Input = React.createClass({
groupClassName: React.PropTypes.string,
wrapperClassName: React.PropTypes.string,
labelClassName: React.PropTypes.string,
disabled: React.PropTypes.bool
multiple: React.PropTypes.bool,
disabled: React.PropTypes.bool,
value: React.PropTypes.any
},

getInputDOMNode() {
Expand Down
3 changes: 3 additions & 0 deletions src/SplitButton.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
/* eslint react/prop-types: [1, {ignore: ["children", "className", "bsSize"]}]*/
/* BootstrapMixin contains `bsSize` type validation */
import React from 'react';
import classNames from 'classnames';
import BootstrapMixin from './BootstrapMixin';
Expand All @@ -16,6 +18,7 @@ const SplitButton = React.createClass({
id: React.PropTypes.string,
target: React.PropTypes.string,
dropdownTitle: React.PropTypes.node,
dropup: React.PropTypes.bool,
onClick: React.PropTypes.func,
onSelect: React.PropTypes.func,
disabled: React.PropTypes.bool
Expand Down
6 changes: 4 additions & 2 deletions src/TabPane.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@ import TransitionEvents from './utils/TransitionEvents';

const TabPane = React.createClass({
propTypes: {
active: React.PropTypes.bool
active: React.PropTypes.bool,
animation: React.PropTypes.bool,
onAnimateOutEnd: React.PropTypes.func
},

getDefaultProps() {
Expand Down Expand Up @@ -60,7 +62,7 @@ const TabPane = React.createClass({
animateOut: false
});

if (typeof this.props.onAnimateOutEnd === 'function') {
if (this.props.onAnimateOutEnd) {
this.props.onAnimateOutEnd();
}
}
Expand Down

0 comments on commit 5ce17e9

Please sign in to comment.