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

Merge remote-tracking branch 'origin/auth' into auth

Browse Source 
# Conflicts:
#	dist/swagger-ui.js
#	dist/swagger-ui.min.js
This commit is contained in:
Anna Bodnia
2016-03-04 21:10:33 +02:00
parent 9b85437ad6 bc030fbde0
commit 54f2bc07ff
2 changed files with 7 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
dist/swagger-ui.js vendored
View File

@@ -19683,7 +19683,7 @@ SwaggerUi.Views.OperationView = Backbone.View.extend({
signatureModel = { signatureModel = {
sampleJSON: isJSON ? JSON.stringify(SwaggerUi.partials.signature.createJSONSample(value), void 0, 2) : false, sampleJSON: isJSON ? JSON.stringify(SwaggerUi.partials.signature.createJSONSample(value), void 0, 2) : false,
isParam: false, isParam: false,
sampleXML: isXML ? SwaggerUi.partials.signature.createXMLSample(value.name, value.definition, value.models) : false, sampleXML: isXML ? SwaggerUi.partials.signature.createXMLSample(value.definition, value.models) : false,
signature: SwaggerUi.partials.signature.getModelSignature(value.name, value.definition, value.models, value.modelPropertyMacro) signature: SwaggerUi.partials.signature.getModelSignature(value.name, value.definition, value.models, value.modelPropertyMacro)
}; };
} else { } else {
@@ -20230,15 +20230,6 @@ SwaggerUi.Views.OperationView = Backbone.View.extend({
var fileName = response.url.substr(response.url.lastIndexOf('/') + 1); var fileName = response.url.substr(response.url.lastIndexOf('/') + 1);
var download = [type, fileName, href].join(':'); var download = [type, fileName, href].join(':');
// Use filename from response header
var disposition = headers['content-disposition'] || headers['Content-Disposition'];
if(typeof disposition !== 'undefined') {
var responseFilename = /filename=([^;]*);?/.exec(disposition);
if(responseFilename !== null && responseFilename.length > 1) {
download = responseFilename[1];
}
}
a.setAttribute('href', href); a.setAttribute('href', href);
a.setAttribute('download', download); a.setAttribute('download', download);
a.innerText = 'Download ' + fileName; a.innerText = 'Download ' + fileName;
@@ -20431,7 +20422,7 @@ SwaggerUi.Views.ParameterView = Backbone.View.extend({
var signatureModel = { var signatureModel = {
sampleJSON: isJSON ? sampleJSON : false, sampleJSON: isJSON ? sampleJSON : false,
sampleXML: sampleJSON && isXML ? SwaggerUi.partials.signature.createXMLSample('', schema, modelDefinitions, true) : false, sampleXML: sampleJSON && isXML ? SwaggerUi.partials.signature.createXMLSample(schema, modelDefinitions, true) : false,
isParam: true, isParam: true,
signature: SwaggerUi.partials.signature.getParameterModelSignature(modelType, modelDefinitions), signature: SwaggerUi.partials.signature.getParameterModelSignature(modelType, modelDefinitions),
defaultRendering: this.model.defaultRendering defaultRendering: this.model.defaultRendering
@@ -21486,10 +21477,10 @@ SwaggerUi.partials.signature = (function () {
return new Descriptor(name, type, definition, models, config); return new Descriptor(name, type, definition, models, config);
} }
function createXMLSample (name, definition, models, isParam) { function createXMLSample (definition, models, isParam) {
var prolog = '<?xml version="1.0"?>'; var prolog = '<?xml version="1.0"?>';
return formatXml(prolog + createSchemaXML(name, definition, models, { isParam: isParam } )); return formatXml(prolog + createSchemaXML('', definition, models, { isParam: isParam } ));
} }
return { return {
@@ -21732,7 +21723,7 @@ SwaggerUi.Views.StatusCodeView = Backbone.View.extend({
if (this.router.api.models.hasOwnProperty(this.model.responseModel)) { if (this.router.api.models.hasOwnProperty(this.model.responseModel)) {
responseModel = { responseModel = {
sampleJSON: JSON.stringify(SwaggerUi.partials.signature.createJSONSample(value), void 0, 2), sampleJSON: JSON.stringify(SwaggerUi.partials.signature.createJSONSample(value), void 0, 2),
sampleXML: this.model.isXML ? SwaggerUi.partials.signature.createXMLSample('', this.model.schema, this.router.api.models) : false, sampleXML: this.model.isXML ? SwaggerUi.partials.signature.createXMLSample(this.model.schema, this.router.api.models) : false,
isParam: false, isParam: false,
signature: SwaggerUi.partials.signature.getModelSignature(this.model.responseModel, value, this.router.api.models), signature: SwaggerUi.partials.signature.getModelSignature(this.model.responseModel, value, this.router.api.models),
defaultRendering: this.model.defaultRendering defaultRendering: this.model.defaultRendering

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

File diff suppressed because one or more lines are too long