Merge branch 'master' of github.com:swagger-api/swagger-ui into bug/3414-redo

# Conflicts:
#	src/core/json-schema-components.js
#	src/core/utils.js
#	src/style/_buttons.scss
#	src/style/_form.scss
#	src/style/_mixins.scss
#	test/core/utils.js
This commit is contained in:
Owen Conti
2017-07-24 18:53:45 -06:00
9 changed files with 12 additions and 17 deletions

View File

@@ -129,8 +129,7 @@ export class Select extends React.Component {
value: PropTypes.any,
onChange: PropTypes.func,
multiple: PropTypes.bool,
allowEmptyValue: PropTypes.bool,
className: PropTypes.string
allowEmptyValue: PropTypes.bool
}
static defaultProps = {
@@ -143,7 +142,7 @@ export class Select extends React.Component {
let value
if (props.value) {
if (props.value !== undefined) {
value = props.value
} else {
value = props.multiple ? [""] : ""
@@ -179,7 +178,7 @@ export class Select extends React.Component {
let value = this.state.value.toJS ? this.state.value.toJS() : this.state.value
return (
<select className={this.props.className} multiple={ multiple } value={ value } onChange={ this.onChange } >
<select multiple={ multiple } value={ value } onChange={ this.onChange } >
{ allowEmptyValue ? <option value="">--</option> : null }
{
allowedValues.map(function (item, key) {

View File

@@ -97,10 +97,6 @@ table
width: 100%;
max-width: 340px;
}
select {
border-width: 1px;
}
}
.parameter__name