Skip to content

Commit 9281a3b

Browse files
committed
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
2 parents f570ffc + febd5ff commit 9281a3b

File tree

9 files changed

+12
-17
lines changed

9 files changed

+12
-17
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ The OpenAPI Specification has undergone 4 revisions since initial creation in 20
2222

2323
Swagger UI Version | Release Date | OpenAPI Spec compatibility | Notes | Status
2424
------------------ | ------------ | -------------------------- | ----- | ------
25-
3.0.20 | 2017-07-21 | 2.0 | [tag v3.0.20](https://github.com/swagger-api/swagger-ui/tree/v3.0.20) |
25+
3.0.21 | 2017-07-24 | 2.0 | [tag v3.0.21](https://github.com/swagger-api/swagger-ui/tree/v3.0.21) |
2626
2.2.10 | 2017-01-04 | 1.1, 1.2, 2.0 | [tag v2.2.10](https://github.com/swagger-api/swagger-ui/tree/v2.2.10) |
2727
2.1.5 | 2016-07-20 | 1.1, 1.2, 2.0 | [tag v2.1.5](https://github.com/swagger-api/swagger-ui/tree/v2.1.5) |
2828
2.0.24 | 2014-09-12 | 1.1, 1.2 | [tag v2.0.24](https://github.com/swagger-api/swagger-ui/tree/v2.0.24) |

dist/swagger-ui-bundle.js

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/swagger-ui-bundle.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/swagger-ui.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/swagger-ui.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/swagger-ui.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "swagger-ui",
3-
"version": "3.0.20",
3+
"version": "3.0.21",
44
"main": "dist/swagger-ui.js",
55
"repository": "[email protected]:swagger-api/swagger-ui.git",
66
"contributors": [

src/core/components/layout-utils.jsx

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -129,8 +129,7 @@ export class Select extends React.Component {
129129
value: PropTypes.any,
130130
onChange: PropTypes.func,
131131
multiple: PropTypes.bool,
132-
allowEmptyValue: PropTypes.bool,
133-
className: PropTypes.string
132+
allowEmptyValue: PropTypes.bool
134133
}
135134

136135
static defaultProps = {
@@ -143,7 +142,7 @@ export class Select extends React.Component {
143142

144143
let value
145144

146-
if (props.value) {
145+
if (props.value !== undefined) {
147146
value = props.value
148147
} else {
149148
value = props.multiple ? [""] : ""
@@ -179,7 +178,7 @@ export class Select extends React.Component {
179178
let value = this.state.value.toJS ? this.state.value.toJS() : this.state.value
180179

181180
return (
182-
<select className={this.props.className} multiple={ multiple } value={ value } onChange={ this.onChange } >
181+
<select multiple={ multiple } value={ value } onChange={ this.onChange } >
183182
{ allowEmptyValue ? <option value="">--</option> : null }
184183
{
185184
allowedValues.map(function (item, key) {

src/style/_table.scss

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -97,10 +97,6 @@ table
9797
width: 100%;
9898
max-width: 340px;
9999
}
100-
101-
select {
102-
border-width: 1px;
103-
}
104100
}
105101

106102
.parameter__name

0 commit comments

Comments
 (0)