Tony Tam 10 years ago
parent
commit
2a642f5a5f
3 changed files with 31 additions and 25 deletions
  1. +15
    -12
      dist/lib/swagger.js
  2. +15
    -12
      lib/swagger.js
  3. +1
    -1
      package.json

+ 15
- 12
dist/lib/swagger.js View File

@@ -1,5 +1,5 @@
// swagger.js
// version 2.0.19
// version 2.0.21

var __bind = function(fn, me){
return function(){
@@ -829,10 +829,11 @@ SwaggerOperation.prototype.urlify = function(args) {
for(var i = 0; i < params.length; i ++){
var param = params[i];
if(param.paramType === 'query') {
if(queryParams !== '')
queryParams += "&";
if(args[param.name] !== undefined)
if (args[param.name] !== undefined) {
if (queryParams !== '')
queryParams += "&";
queryParams += encodeURIComponent(param.name) + '=' + encodeURIComponent(args[param.name]);
}
}
}
if ((queryParams != null) && queryParams.length > 0)
@@ -964,23 +965,25 @@ var SwaggerRequest = function(type, url, params, opts, successCallback, errorCal
var possibleParams = {};
var values = {};

for(var i = 0; i < formParams.length; i++){
var param = formParams[i];
for(var key in formParams){
var param = formParams[key];
values[param.name] = param;
}

var encoded = "";
for(key in values) {
for(var key in values) {
value = this.params[key];
if(encoded !== "")
encoded += "&";
encoded += encodeURIComponent(key) + '=' + encodeURIComponent(value);
if(typeof value !== 'undefined'){
if(encoded !== "")
encoded += "&";
encoded += encodeURIComponent(key) + '=' + encodeURIComponent(value);
}
}
body = encoded
body = encoded;
}
for (name in this.headers)
myHeaders[name] = this.headers[name];
if (requestContentType && body)
if ((requestContentType && body !== "") || (requestContentType === "application/x-www-form-urlencoded"))
myHeaders["Content-Type"] = requestContentType;
if (responseContentType)
myHeaders["Accept"] = responseContentType;


+ 15
- 12
lib/swagger.js View File

@@ -1,5 +1,5 @@
// swagger.js
// version 2.0.19
// version 2.0.21

var __bind = function(fn, me){
return function(){
@@ -829,10 +829,11 @@ SwaggerOperation.prototype.urlify = function(args) {
for(var i = 0; i < params.length; i ++){
var param = params[i];
if(param.paramType === 'query') {
if(queryParams !== '')
queryParams += "&";
if(args[param.name] !== undefined)
if (args[param.name] !== undefined) {
if (queryParams !== '')
queryParams += "&";
queryParams += encodeURIComponent(param.name) + '=' + encodeURIComponent(args[param.name]);
}
}
}
if ((queryParams != null) && queryParams.length > 0)
@@ -964,23 +965,25 @@ var SwaggerRequest = function(type, url, params, opts, successCallback, errorCal
var possibleParams = {};
var values = {};

for(var i = 0; i < formParams.length; i++){
var param = formParams[i];
for(var key in formParams){
var param = formParams[key];
values[param.name] = param;
}

var encoded = "";
for(key in values) {
for(var key in values) {
value = this.params[key];
if(encoded !== "")
encoded += "&";
encoded += encodeURIComponent(key) + '=' + encodeURIComponent(value);
if(typeof value !== 'undefined'){
if(encoded !== "")
encoded += "&";
encoded += encodeURIComponent(key) + '=' + encodeURIComponent(value);
}
}
body = encoded
body = encoded;
}
for (name in this.headers)
myHeaders[name] = this.headers[name];
if (requestContentType && body)
if ((requestContentType && body !== "") || (requestContentType === "application/x-www-form-urlencoded"))
myHeaders["Content-Type"] = requestContentType;
if (responseContentType)
myHeaders["Accept"] = responseContentType;


+ 1
- 1
package.json View File

@@ -19,7 +19,7 @@
"readmeFilename": "README.md",
"dependencies": {
"coffee-script": "~1.5.0",
"swagger-client": "2.0.19",
"swagger-client": "2.0.21",
"handlebars": "~1.0.10",
"less": "~1.4.2"
}


Loading…
Cancel
Save