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

fix for #855

Browse Source
This commit is contained in:
Tony Tam
2015-01-29 21:26:34 -08:00
parent 1418f12f1d
commit 6a645a8f55
2 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
dist/lib/swagger-client.js vendored
View File

@@ -204,21 +204,21 @@ if (!Array.prototype.indexOf) {
* allows override of the default value based on the parameter being * allows override of the default value based on the parameter being
* supplied * supplied
**/ **/
var applyParameterMacro = function (model, parameter) { var applyParameterMacro = function (operation, parameter) {
var e = (typeof window !== 'undefined' ? window : exports); var e = (typeof window !== 'undefined' ? window : exports);
if(e.parameterMacro) if(e.parameterMacro)
return e.parameterMacro(model, parameter); return e.parameterMacro(operation, parameter);
else else
return parameter.defaultValue; return parameter.defaultValue;
}; };
/** /**
* allows overriding the default value of an operation * allows overriding the default value of an model property
**/ **/
var applyModelPropertyMacro = function (operation, property) { var applyModelPropertyMacro = function (model, property) {
var e = (typeof window !== 'undefined' ? window : exports); var e = (typeof window !== 'undefined' ? window : exports);
if(e.modelPropertyMacro) if(e.modelPropertyMacro)
return e.modelPropertyMacro(operation, property); return e.modelPropertyMacro(model, property);
else else
return property.defaultValue; return property.defaultValue;
}; };
@@ -913,7 +913,6 @@ var SwaggerOperation = function (nickname, path, method, parameters, summary, no
var param = this.parameters[i]; var param = this.parameters[i];
// might take this away // might take this away
param.name = param.name || param.type || param.dataType; param.name = param.name || param.type || param.dataType;
// for 1.1 compatibility // for 1.1 compatibility
type = param.type || param.dataType; type = param.type || param.dataType;
if (type === 'array') { if (type === 'array') {
@@ -976,7 +975,7 @@ var SwaggerOperation = function (nickname, path, method, parameters, summary, no
} }
} }
} }
param.defaultValue = applyParameterMacro(param, this); param.defaultValue = applyParameterMacro(this, param);
} }
var defaultSuccessCallback = this.resource.api.defaultSuccessCallback || null; var defaultSuccessCallback = this.resource.api.defaultSuccessCallback || null;
var defaultErrorCallback = this.resource.api.defaultErrorCallback || null; var defaultErrorCallback = this.resource.api.defaultErrorCallback || null;

13
lib/swagger-client.js
View File

@@ -204,21 +204,21 @@ if (!Array.prototype.indexOf) {
* allows override of the default value based on the parameter being * allows override of the default value based on the parameter being
* supplied * supplied
**/ **/
var applyParameterMacro = function (model, parameter) { var applyParameterMacro = function (operation, parameter) {
var e = (typeof window !== 'undefined' ? window : exports); var e = (typeof window !== 'undefined' ? window : exports);
if(e.parameterMacro) if(e.parameterMacro)
return e.parameterMacro(model, parameter); return e.parameterMacro(operation, parameter);
else else
return parameter.defaultValue; return parameter.defaultValue;
}; };
/** /**
* allows overriding the default value of an operation * allows overriding the default value of an model property
**/ **/
var applyModelPropertyMacro = function (operation, property) { var applyModelPropertyMacro = function (model, property) {
var e = (typeof window !== 'undefined' ? window : exports); var e = (typeof window !== 'undefined' ? window : exports);
if(e.modelPropertyMacro) if(e.modelPropertyMacro)
return e.modelPropertyMacro(operation, property); return e.modelPropertyMacro(model, property);
else else
return property.defaultValue; return property.defaultValue;
}; };
@@ -913,7 +913,6 @@ var SwaggerOperation = function (nickname, path, method, parameters, summary, no
var param = this.parameters[i]; var param = this.parameters[i];
// might take this away // might take this away
param.name = param.name || param.type || param.dataType; param.name = param.name || param.type || param.dataType;
// for 1.1 compatibility // for 1.1 compatibility
type = param.type || param.dataType; type = param.type || param.dataType;
if (type === 'array') { if (type === 'array') {
@@ -976,7 +975,7 @@ var SwaggerOperation = function (nickname, path, method, parameters, summary, no
} }
} }
} }
param.defaultValue = applyParameterMacro(param, this); param.defaultValue = applyParameterMacro(this, param);
} }
var defaultSuccessCallback = this.resource.api.defaultSuccessCallback || null; var defaultSuccessCallback = this.resource.api.defaultSuccessCallback || null;
var defaultErrorCallback = this.resource.api.defaultErrorCallback || null; var defaultErrorCallback = this.resource.api.defaultErrorCallback || null;