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

fix for https://github.com/wordnik/swagger-js/issues/81

Browse Source
This commit is contained in:
Tony Tam
2014-02-26 12:13:42 -08:00
parent aa848529c0
commit 2a642f5a5f
3 changed files with 31 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
dist/lib/swagger.js vendored
View File

@@ -1,5 +1,5 @@
// swagger.js // swagger.js
// version 2.0.19 // version 2.0.21
var __bind = function(fn, me){ var __bind = function(fn, me){
return function(){ return function(){
@@ -829,10 +829,11 @@ SwaggerOperation.prototype.urlify = function(args) {
for(var i = 0; i < params.length; i ++){ for(var i = 0; i < params.length; i ++){
var param = params[i]; var param = params[i];
if(param.paramType === 'query') { if(param.paramType === 'query') {
if(queryParams !== '') if (args[param.name] !== undefined) {
queryParams += "&"; if (queryParams !== '')
if(args[param.name] !== undefined) queryParams += "&";
queryParams += encodeURIComponent(param.name) + '=' + encodeURIComponent(args[param.name]); queryParams += encodeURIComponent(param.name) + '=' + encodeURIComponent(args[param.name]);
}
} }
} }
if ((queryParams != null) && queryParams.length > 0) if ((queryParams != null) && queryParams.length > 0)
@@ -964,23 +965,25 @@ var SwaggerRequest = function(type, url, params, opts, successCallback, errorCal
var possibleParams = {}; var possibleParams = {};
var values = {}; var values = {};
for(var i = 0; i < formParams.length; i++){ for(var key in formParams){
var param = formParams[i]; var param = formParams[key];
values[param.name] = param; values[param.name] = param;
} }
var encoded = ""; var encoded = "";
for(key in values) { for(var key in values) {
value = this.params[key]; value = this.params[key];
if(encoded !== "") if(typeof value !== 'undefined'){
encoded += "&"; if(encoded !== "")
encoded += encodeURIComponent(key) + '=' + encodeURIComponent(value); encoded += "&";
encoded += encodeURIComponent(key) + '=' + encodeURIComponent(value);
}
} }
body = encoded body = encoded;
} }
for (name in this.headers) for (name in this.headers)
myHeaders[name] = this.headers[name]; myHeaders[name] = this.headers[name];
if (requestContentType && body) if ((requestContentType && body !== "") || (requestContentType === "application/x-www-form-urlencoded"))
myHeaders["Content-Type"] = requestContentType; myHeaders["Content-Type"] = requestContentType;
if (responseContentType) if (responseContentType)
myHeaders["Accept"] = responseContentType; myHeaders["Accept"] = responseContentType;

27
lib/swagger.js
View File

@@ -1,5 +1,5 @@
// swagger.js // swagger.js
// version 2.0.19 // version 2.0.21
var __bind = function(fn, me){ var __bind = function(fn, me){
return function(){ return function(){
@@ -829,10 +829,11 @@ SwaggerOperation.prototype.urlify = function(args) {
for(var i = 0; i < params.length; i ++){ for(var i = 0; i < params.length; i ++){
var param = params[i]; var param = params[i];
if(param.paramType === 'query') { if(param.paramType === 'query') {
if(queryParams !== '') if (args[param.name] !== undefined) {
queryParams += "&"; if (queryParams !== '')
if(args[param.name] !== undefined) queryParams += "&";
queryParams += encodeURIComponent(param.name) + '=' + encodeURIComponent(args[param.name]); queryParams += encodeURIComponent(param.name) + '=' + encodeURIComponent(args[param.name]);
}
} }
} }
if ((queryParams != null) && queryParams.length > 0) if ((queryParams != null) && queryParams.length > 0)
@@ -964,23 +965,25 @@ var SwaggerRequest = function(type, url, params, opts, successCallback, errorCal
var possibleParams = {}; var possibleParams = {};
var values = {}; var values = {};
for(var i = 0; i < formParams.length; i++){ for(var key in formParams){
var param = formParams[i]; var param = formParams[key];
values[param.name] = param; values[param.name] = param;
} }
var encoded = ""; var encoded = "";
for(key in values) { for(var key in values) {
value = this.params[key]; value = this.params[key];
if(encoded !== "") if(typeof value !== 'undefined'){
encoded += "&"; if(encoded !== "")
encoded += encodeURIComponent(key) + '=' + encodeURIComponent(value); encoded += "&";
encoded += encodeURIComponent(key) + '=' + encodeURIComponent(value);
}
} }
body = encoded body = encoded;
} }
for (name in this.headers) for (name in this.headers)
myHeaders[name] = this.headers[name]; myHeaders[name] = this.headers[name];
if (requestContentType && body) if ((requestContentType && body !== "") || (requestContentType === "application/x-www-form-urlencoded"))
myHeaders["Content-Type"] = requestContentType; myHeaders["Content-Type"] = requestContentType;
if (responseContentType) if (responseContentType)
myHeaders["Accept"] = responseContentType; myHeaders["Accept"] = responseContentType;

2
package.json
View File

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