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

merged from develop, added fix for #627

Browse Source
This commit is contained in:
Tony Tam
2014-12-02 22:24:47 -08:00
parent 855c015a3f
commit 6961dd7f92
8 changed files with 75 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -513,7 +513,11 @@ SwaggerClient.prototype.idFromOp = function(path, httpMethod, op) {
return (op.operationId);
}
else {
return path.substring(1).replace(/\//g, "_").replace(/\{/g, "").replace(/\}/g, "") + "_" + httpMethod;
return path.substring(1)
.replace(/\//g, "_")
.replace(/\{/g, "")
.replace(/\}/g, "")
.replace(/\./g, "_") + "_" + httpMethod;
}
}
@@ -658,8 +662,8 @@ Operation.prototype.getType = function (param) {
str = 'integer';
else if(type === 'integer' && format === 'int64')
str = 'long';
else if(type === 'integer' && typeof format === 'undefined')
str = 'long';
else if(type === 'integer')
str = 'integer'
else if(type === 'string' && format === 'date-time')
str = 'date-time';
else if(type === 'string' && format === 'date')
@@ -668,7 +672,7 @@ Operation.prototype.getType = function (param) {
str = 'float';
else if(type === 'number' && format === 'double')
str = 'double';
else if(type === 'number' && typeof format === 'undefined')
else if(type === 'number')
str = 'double';
else if(type === 'boolean')
str = 'boolean';
@@ -878,7 +882,12 @@ Operation.prototype.execute = function(arg1, arg2, arg3, arg4, parent) {
// todo append?
args.body = encoded;
}
var url = this.scheme + '://' + this.host + this.basePath + requestUrl + querystring;
var url = this.scheme + '://' + this.host;
if(this.basePath !== '/')
url += this.basePath;
url += requestUrl + querystring;
var obj = {
url: url,

15
dist/lib/swagger.js vendored
View File

@@ -1,5 +1,5 @@
// swagger.js
// version 2.0.46
// version 2.0.47
(function () {
@@ -992,9 +992,14 @@
output += encodeURIComponent(param[j]);
}
queryParams += encodeURIComponent(param.name) + '=' + output;
}
else {
queryParams += encodeURIComponent(param.name) + '=' + encodeURIComponent(args[param.name]);
}
else {
if (args[param.name]) {
queryParams += encodeURIComponent(param.name) + '=' + encodeURIComponent(args[param.name]);
} else {
if (param.required)
throw "" + param.name + " is a required query param.";
}
}
}
}
@@ -1275,7 +1280,7 @@
else if (this.type === "DELETE")
body = "{}";
else if (this.type != "DELETE")
accepts = null;
consumes = null;
}
if (consumes && this.operation.consumes) {

19
dist/swagger-ui.js vendored
View File

@@ -990,7 +990,7 @@ function program4(depth0,data) {
function program5(depth0,data) {
var buffer = "", stack1;
buffer += "\n <textarea class='body-textarea' placeholder='(required)' name='";
buffer += "\n <textarea class='body-textarea required' placeholder='(required)' name='";
if (stack1 = helpers.name) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
else { stack1 = depth0.name; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
buffer += escapeExpression(stack1)
@@ -1005,7 +1005,7 @@ function program5(depth0,data) {
function program7(depth0,data) {
var buffer = "", stack1;
buffer += "\n <textarea class='body-textarea' placeholder='(required)' name='";
buffer += "\n <textarea class='body-textarea required' placeholder='(required)' name='";
if (stack1 = helpers.name) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
else { stack1 = depth0.name; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
buffer += escapeExpression(stack1)
@@ -1949,6 +1949,19 @@ helpers = this.merge(helpers, Handlebars.helpers); data = data || {};
return error_free = false;
}
});
form.find("textarea.required").each(function() {
var _this = this;
$(this).removeClass("error");
if (jQuery.trim($(this).val()) === "") {
$(this).addClass("error");
$(this).wiggle({
callback: function() {
return $(_this).focus();
}
});
return error_free = false;
}
});
if (error_free) {
map = {};
opts = {
@@ -2262,7 +2275,7 @@ helpers = this.merge(helpers, Handlebars.helpers); data = data || {};
OperationView.prototype.toggleOperationContent = function() {
var elem;
elem = $('#' + Docs.escapeResourceName(this.model.parentId) + "_" + this.model.nickname + "_content");
elem = $('#' + Docs.escapeResourceName(this.model.parentId + "_" + this.model.nickname + "_content"));
if (elem.is(':visible')) {
return Docs.collapseOperation(elem);
} else {

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

File diff suppressed because one or more lines are too long

19
lib/swagger-client.js
View File

@@ -513,7 +513,11 @@ SwaggerClient.prototype.idFromOp = function(path, httpMethod, op) {
return (op.operationId);
}
else {
return path.substring(1).replace(/\//g, "_").replace(/\{/g, "").replace(/\}/g, "") + "_" + httpMethod;
return path.substring(1)
.replace(/\//g, "_")
.replace(/\{/g, "")
.replace(/\}/g, "")
.replace(/\./g, "_") + "_" + httpMethod;
}
}
@@ -658,8 +662,8 @@ Operation.prototype.getType = function (param) {
str = 'integer';
else if(type === 'integer' && format === 'int64')
str = 'long';
else if(type === 'integer' && typeof format === 'undefined')
str = 'long';
else if(type === 'integer')
str = 'integer'
else if(type === 'string' && format === 'date-time')
str = 'date-time';
else if(type === 'string' && format === 'date')
@@ -668,7 +672,7 @@ Operation.prototype.getType = function (param) {
str = 'float';
else if(type === 'number' && format === 'double')
str = 'double';
else if(type === 'number' && typeof format === 'undefined')
else if(type === 'number')
str = 'double';
else if(type === 'boolean')
str = 'boolean';
@@ -878,7 +882,12 @@ Operation.prototype.execute = function(arg1, arg2, arg3, arg4, parent) {
// todo append?
args.body = encoded;
}
var url = this.scheme + '://' + this.host + this.basePath + requestUrl + querystring;
var url = this.scheme + '://' + this.host;
if(this.basePath !== '/')
url += this.basePath;
url += requestUrl + querystring;
var obj = {
url: url,

15
lib/swagger.js
View File

@@ -1,5 +1,5 @@
// swagger.js
// version 2.0.46
// version 2.0.47
(function () {
@@ -992,9 +992,14 @@
output += encodeURIComponent(param[j]);
}
queryParams += encodeURIComponent(param.name) + '=' + output;
}
else {
queryParams += encodeURIComponent(param.name) + '=' + encodeURIComponent(args[param.name]);
}
else {
if (args[param.name]) {
queryParams += encodeURIComponent(param.name) + '=' + encodeURIComponent(args[param.name]);
} else {
if (param.required)
throw "" + param.name + " is a required query param.";
}
}
}
}
@@ -1275,7 +1280,7 @@
else if (this.type === "DELETE")
body = "{}";
else if (this.type != "DELETE")
accepts = null;
consumes = null;
}
if (consumes && this.operation.consumes) {

9
src/main/coffeescript/view/OperationView.coffee
View File

@@ -157,6 +157,13 @@ class OperationView extends Backbone.View
$(@).wiggle
callback: => $(@).focus()
error_free = false
form.find("textarea.required").each ->
$(@).removeClass "error"
if jQuery.trim($(@).val()) is ""
$(@).addClass "error"
$(@).wiggle
callback: => $(@).focus()
error_free = false
# if error free submit it
if error_free
@@ -420,5 +427,5 @@ class OperationView extends Backbone.View
if opts.highlightSizeThreshold && response.data.length > opts.highlightSizeThreshold then response_body_el else hljs.highlightBlock(response_body_el)
toggleOperationContent: ->
elem = $('#' + Docs.escapeResourceName(@model.parentId) + "_" + @model.nickname + "_content")
elem = $('#' + Docs.escapeResourceName(@model.parentId + "_" + @model.nickname + "_content"))
if elem.is(':visible') then Docs.collapseOperation(elem) else Docs.expandOperation(elem)

4
src/main/template/param_required.handlebars
View File

@@ -5,9 +5,9 @@
<input type="file" name='{{name}}'/>
{{else}}
{{#if default}}
<textarea class='body-textarea' placeholder='(required)' name='{{name}}'>{{default}}</textarea>
<textarea class='body-textarea required' placeholder='(required)' name='{{name}}'>{{default}}</textarea>
{{else}}
<textarea class='body-textarea' placeholder='(required)' name='{{name}}'></textarea>
<textarea class='body-textarea required' placeholder='(required)' name='{{name}}'></textarea>
<br />
<div class="parameter-content-type" />
{{/if}}