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

fix for #770

Browse Source
This commit is contained in:
Tony Tam
2014-12-09 22:25:29 -08:00
parent 886145be28
commit f1e394b3c9
2 changed files with 26 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,5 +1,5 @@
// swagger-client.js // swagger-client.js
// version 2.1.0-alpha.3 // version 2.1.0-alpha.4
/** /**
* Array Model * Array Model
**/ **/
@@ -936,7 +936,7 @@ Operation.prototype.setContentTypes = function(args, opts) {
} }
// if there's a body, need to set the accepts header via requestContentType // if there's a body, need to set the accepts header via requestContentType
if (body && (this.type === 'post' || this.type === 'put' || this.type === 'patch' || this.type === 'delete')) { if (body && (this.method === 'post' || this.method === 'put' || this.method === 'patch' || this.method === 'delete')) {
if (opts.requestContentType) if (opts.requestContentType)
consumes = opts.requestContentType; consumes = opts.requestContentType;
} else { } else {
@@ -1350,7 +1350,7 @@ JQueryHttpClient.prototype.execute = function(obj) {
obj.data = obj.body; obj.data = obj.body;
obj.complete = function(response, textStatus, opts) { obj.complete = function(response, textStatus, opts) {
var headers = {}, var headers = {},
headerArray = response.getAllResponseHeaders().split("\n"); headerArray = response.getAllResponseHeaders().split("\n");
for(var i = 0; i < headerArray.length; i++) { for(var i = 0; i < headerArray.length; i++) {
var toSplit = headerArray[i].trim(); var toSplit = headerArray[i].trim();
@@ -1363,7 +1363,7 @@ JQueryHttpClient.prototype.execute = function(obj) {
continue; continue;
} }
var name = toSplit.substring(0, separator).trim(), var name = toSplit.substring(0, separator).trim(),
value = toSplit.substring(separator + 1).trim(); value = toSplit.substring(separator + 1).trim();
headers[name] = value; headers[name] = value;
} }
@@ -1379,8 +1379,15 @@ JQueryHttpClient.prototype.execute = function(obj) {
if(contentType != null) { if(contentType != null) {
if(contentType.indexOf("application/json") == 0 || contentType.indexOf("+json") > 0) { if(contentType.indexOf("application/json") == 0 || contentType.indexOf("+json") > 0) {
if(response.responseText && response.responseText !== "") if(response.responseText && response.responseText !== "") {
out.obj = JSON.parse(response.responseText); try {
out.obj = JSON.parse(response.content.data);
}
catch (ex) {
// do not set out.obj
log ("unable to parse JSON content");
}
}
else else
out.obj = {} out.obj = {}
} }

19
lib/swagger-client.js
View File

@@ -1,5 +1,5 @@
// swagger-client.js // swagger-client.js
// version 2.1.0-alpha.3 // version 2.1.0-alpha.4
/** /**
* Array Model * Array Model
**/ **/
@@ -936,7 +936,7 @@ Operation.prototype.setContentTypes = function(args, opts) {
} }
// if there's a body, need to set the accepts header via requestContentType // if there's a body, need to set the accepts header via requestContentType
if (body && (this.type === 'post' || this.type === 'put' || this.type === 'patch' || this.type === 'delete')) { if (body && (this.method === 'post' || this.method === 'put' || this.method === 'patch' || this.method === 'delete')) {
if (opts.requestContentType) if (opts.requestContentType)
consumes = opts.requestContentType; consumes = opts.requestContentType;
} else { } else {
@@ -1350,7 +1350,7 @@ JQueryHttpClient.prototype.execute = function(obj) {
obj.data = obj.body; obj.data = obj.body;
obj.complete = function(response, textStatus, opts) { obj.complete = function(response, textStatus, opts) {
var headers = {}, var headers = {},
headerArray = response.getAllResponseHeaders().split("\n"); headerArray = response.getAllResponseHeaders().split("\n");
for(var i = 0; i < headerArray.length; i++) { for(var i = 0; i < headerArray.length; i++) {
var toSplit = headerArray[i].trim(); var toSplit = headerArray[i].trim();
@@ -1363,7 +1363,7 @@ JQueryHttpClient.prototype.execute = function(obj) {
continue; continue;
} }
var name = toSplit.substring(0, separator).trim(), var name = toSplit.substring(0, separator).trim(),
value = toSplit.substring(separator + 1).trim(); value = toSplit.substring(separator + 1).trim();
headers[name] = value; headers[name] = value;
} }
@@ -1379,8 +1379,15 @@ JQueryHttpClient.prototype.execute = function(obj) {
if(contentType != null) { if(contentType != null) {
if(contentType.indexOf("application/json") == 0 || contentType.indexOf("+json") > 0) { if(contentType.indexOf("application/json") == 0 || contentType.indexOf("+json") > 0) {
if(response.responseText && response.responseText !== "") if(response.responseText && response.responseText !== "") {
out.obj = JSON.parse(response.responseText); try {
out.obj = JSON.parse(response.content.data);
}
catch (ex) {
// do not set out.obj
log ("unable to parse JSON content");
}
}
else else
out.obj = {} out.obj = {}
} }