kyy/swagger-ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'bodnia-issue-1911'

Browse Source
This commit is contained in:
Tony Tam
2016-01-25 18:05:22 -08:00
parent 4c5c757bd1 1d2c7aaf51
commit 20f12d2e96
5 changed files with 24 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
dist/swagger-ui.js vendored
View File

@@ -25453,7 +25453,8 @@ SwaggerUi.Views.OperationView = Backbone.View.extend({
code: code,
message: value.description,
responseModel: schema,
headers: value.headers
headers: value.headers,
schema: schemaObj
});
}
}
@@ -26987,6 +26988,10 @@ SwaggerUi.partials.signature = (function () {
return ' ' + attr.name + '="' + attr.value + '"';
}).join('');
if (!name) {
return getErrorMessage('Node name is not provided');
}
str = [
'<', name,
attributes,
@@ -27153,8 +27158,9 @@ SwaggerUi.partials.signature = (function () {
return '<!-- Infinite loop $ref:' + name + ' -->';
}
function getErrorMessage () {
return '<!-- invalid XML -->';
function getErrorMessage (details) {
details = details ? ': ' + details : '';
return '<!-- invalid XML' + details + ' -->';
}
function createSchemaXML (name, definition, models, config) {
@@ -27427,7 +27433,7 @@ SwaggerUi.Views.StatusCodeView = Backbone.View.extend({
if (this.router.api.models.hasOwnProperty(this.model.responseModel)) {
var responseModel = {
sampleJSON: JSON.stringify(SwaggerUi.partials.signature.createJSONSample(value), void 0, 2),
sampleXML: this.model.isXML ? SwaggerUi.partials.signature.createXMLSample(value.definition, value.models) : false,
sampleXML: this.model.isXML ? SwaggerUi.partials.signature.createXMLSample(this.model.schema, value.models) : false,
isParam: false,
signature: SwaggerUi.partials.signature.getModelSignature(this.model.responseModel, value, this.router.api.models),
defaultRendering: this.model.defaultRendering

8
dist/swagger-ui.min.js vendored
View File

File diff suppressed because one or more lines are too long

3
src/main/javascript/view/OperationView.js
View File

@@ -156,7 +156,8 @@ SwaggerUi.Views.OperationView = Backbone.View.extend({
code: code,
message: value.description,
responseModel: schema,
headers: value.headers
headers: value.headers,
schema: schemaObj
});
}
}

2
src/main/javascript/view/StatusCodeView.js
View File

@@ -13,7 +13,7 @@ SwaggerUi.Views.StatusCodeView = Backbone.View.extend({
if (this.router.api.models.hasOwnProperty(this.model.responseModel)) {
var responseModel = {
sampleJSON: JSON.stringify(SwaggerUi.partials.signature.createJSONSample(value), void 0, 2),
sampleXML: this.model.isXML ? SwaggerUi.partials.signature.createXMLSample(value.definition, value.models) : false,
sampleXML: this.model.isXML ? SwaggerUi.partials.signature.createXMLSample(this.model.schema, value.models) : false,
isParam: false,
signature: SwaggerUi.partials.signature.getModelSignature(this.model.responseModel, value, this.router.api.models),
defaultRendering: this.model.defaultRendering

9
src/main/javascript/view/partials/signature.js
View File

@@ -661,6 +661,10 @@ SwaggerUi.partials.signature = (function () {
return ' ' + attr.name + '="' + attr.value + '"';
}).join('');
if (!name) {
return getErrorMessage('Node name is not provided');
}
str = [
'<', name,
attributes,
@@ -827,8 +831,9 @@ SwaggerUi.partials.signature = (function () {
return '<!-- Infinite loop $ref:' + name + ' -->';
}
function getErrorMessage () {
return '<!-- invalid XML -->';
function getErrorMessage (details) {
details = details ? ': ' + details : '';
return '<!-- invalid XML' + details + ' -->';
}
function createSchemaXML (name, definition, models, config) {