openstack
/
fuel-ui
Code Issues Proposed changes

Merge "Fix warnings after upgrade to React v15.1"

This commit is contained in:
Jenkins 2016-08-11 13:25:09 +00:00 committed by Gerrit Code Review
parent b5273f98db e1bec8aaae
commit b000edf0c0
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
static/views/controls.js vendored
View File

@ -71,6 +71,7 @@ export var Input = React.createClass({
tooltipText: React.PropTypes.node, tooltipText: React.PropTypes.node,
toggleable: React.PropTypes.bool, toggleable: React.PropTypes.bool,
onChange: React.PropTypes.func, onChange: React.PropTypes.func,
error: React.PropTypes.node,
extraContent: React.PropTypes.node extraContent: React.PropTypes.node
}, },
getInitialState() { getInitialState() {
@ -178,8 +179,10 @@ export var Input = React.createClass({
}; };
var props = _.extend( var props = _.extend(
{}, _.omit(this.props, [
this.props, 'label', 'debounce', 'description', 'inputClassName', 'wrapperClassName',
'tooltipPlacement', 'tooltipIcon', 'tooltipText', 'toggleable', 'error', 'extraContent'
]),
{ {
ref: 'input', ref: 'input',
key: 'input', key: 'input',
@ -300,7 +303,7 @@ export var RadioGroup = React.createClass({
} }
{_.map(values, {_.map(values,
(value) => <Input (value) => <Input
{...this.props} {..._.omit(this.props, ['values', 'label', 'tooltipText'])}
{...value} {...value}
type='radio' type='radio'
key={value.data} key={value.data}
@ -354,7 +357,7 @@ export var ProgressButton = React.createClass({
'btn-progress': progress 'btn-progress': progress
}); });
return <button return <button
{...this.props} {..._.omit(this.props, ['progress'])}
className={classNames} className={classNames}
> >
{children} {children}