Skip to content

Commit 90fa706

Browse files
Merge branch 'master' into master
2 parents c1abdfb + aee5e75 commit 90fa706

19 files changed

+297
-36
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 5 revisions since initial creation in 20
2222

2323
Swagger UI Version | Release Date | OpenAPI Spec compatibility | Notes
2424
------------------ | ------------ | -------------------------- | -----
25-
3.2.0 | 2017-09-08 | 2.0, 3.0 | [tag v3.2.0](https://github.com/swagger-api/swagger-ui/tree/v3.2.0)
25+
3.2.1 | 2017-09-15 | 2.0, 3.0 | [tag v3.2.1](https://github.com/swagger-api/swagger-ui/tree/v3.2.1)
2626
3.0.21 | 2017-07-26 | 2.0 | [tag v3.0.21](https://github.com/swagger-api/swagger-ui/tree/v3.0.21)
2727
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)
2828
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)

dist/swagger-ui-bundle.js

Lines changed: 16 additions & 11 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-standalone-preset.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.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: 2 additions & 2 deletions
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: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "swagger-ui",
3-
"version": "3.2.0",
3+
"version": "3.2.1",
44
"main": "dist/swagger-ui.js",
55
"repository": "[email protected]:swagger-api/swagger-ui.git",
66
"contributors": [
@@ -41,6 +41,7 @@
4141
"dependencies": {
4242
"base64-js": "^1.2.0",
4343
"brace": "0.7.0",
44+
"classnames": "^2.2.5",
4445
"css.escape": "1.5.1",
4546
"deep-extend": "0.4.1",
4647
"expect": "1.20.2",
@@ -76,7 +77,7 @@
7677
"scroll-to-element": "^2.0.0",
7778
"serialize-error": "2.0.0",
7879
"shallowequal": "0.2.2",
79-
"swagger-client": "3.1.0",
80+
"swagger-client": "3.1.1",
8081
"url-parse": "^1.1.8",
8182
"whatwg-fetch": "0.11.1",
8283
"worker-loader": "^0.7.1",

src/core/components/operation.jsx

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ export default class Operation extends PureComponent {
2828
authSelectors: PropTypes.object,
2929
specActions: PropTypes.object.isRequired,
3030
specSelectors: PropTypes.object.isRequired,
31+
oas3Actions: PropTypes.object.isRequired,
3132
layoutActions: PropTypes.object.isRequired,
3233
layoutSelectors: PropTypes.object.isRequired,
3334
fn: PropTypes.object.isRequired,
@@ -117,7 +118,8 @@ export default class Operation extends PureComponent {
117118
specSelectors,
118119
authActions,
119120
authSelectors,
120-
getConfigs
121+
getConfigs,
122+
oas3Actions
121123
} = this.props
122124

123125
let summary = operation.get("summary")
@@ -265,6 +267,7 @@ export default class Operation extends PureComponent {
265267
getComponent={ getComponent }
266268
getConfigs={ getConfigs }
267269
specSelectors={ specSelectors }
270+
oas3Actions={oas3Actions}
268271
specActions={ specActions }
269272
produces={ produces }
270273
producesValue={ operation.get("produces_value") }

src/core/components/operations.jsx

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ export default class Operations extends React.Component {
99
static propTypes = {
1010
specSelectors: PropTypes.object.isRequired,
1111
specActions: PropTypes.object.isRequired,
12+
oas3Actions: PropTypes.object.isRequired,
1213
getComponent: PropTypes.func.isRequired,
1314
layoutSelectors: PropTypes.object.isRequired,
1415
layoutActions: PropTypes.object.isRequired,
@@ -21,6 +22,7 @@ export default class Operations extends React.Component {
2122
let {
2223
specSelectors,
2324
specActions,
25+
oas3Actions,
2426
getComponent,
2527
layoutSelectors,
2628
layoutActions,
@@ -147,6 +149,8 @@ export default class Operations extends React.Component {
147149
specActions={ specActions }
148150
specSelectors={ specSelectors }
149151

152+
oas3Actions={oas3Actions}
153+
150154
layoutActions={ layoutActions }
151155
layoutSelectors={ layoutSelectors }
152156

0 commit comments

Comments
 (0)