merged logic from #1177

This commit is contained in:
Tony Tam
2015-05-08 12:45:00 -07:00
parent cdd80820cf
commit b1efe883db
5 changed files with 24 additions and 13 deletions

10
dist/swagger-ui.js vendored
View File

@@ -243,7 +243,7 @@ Handlebars.registerHelper('sanitize', function(html) {
});
Handlebars.registerHelper('renderTextParam', function(param) {
var result;
var result, type = 'text';
var isArray = param.type.toLowerCase() === 'array' || param.allowMultiple;
var defaultValue = isArray && Array.isArray(param.default) ? param.default.join('\n') : param.default;
@@ -251,6 +251,10 @@ Handlebars.registerHelper('renderTextParam', function(param) {
defaultValue = '';
}
if(param.format && param.format === 'password') {
type = 'password';
}
if(isArray) {
result = '<textarea class=\'body-textarea' + (param.required ? ' required' : '') + '\' name=\'' + param.name + '\'';
result += ' placeholder=\'Provide multiple values in new lines' + (param.required ? ' (at least one required).' : '.') + '\'>';
@@ -258,7 +262,7 @@ Handlebars.registerHelper('renderTextParam', function(param) {
} else {
result = '<input class=\'parameter\'' + (param.required ? ' class=\'required\'' : '') + ' minlength=\'' + (param.required ? 1 : 0) + '\'';
result += ' name=\'' + param.name +'\' placeholder=\'' + (param.required ? '(required)' : '') + '\'';
result += ' type=\'text\' value=\'' + defaultValue + '\'/>';
result += ' type=\'' + type + '\' value=\'' + defaultValue + '\'/>';
}
return new Handlebars.SafeString(result);
});
@@ -537,7 +541,7 @@ this["Handlebars"]["templates"]["param_list"] = Handlebars.template({"1":functio
},"useData":true});
this["Handlebars"]["templates"]["param_readonly_required"] = Handlebars.template({"1":function(depth0,helpers,partials,data) {
var helper, functionType="function", helperMissing=helpers.helperMissing, escapeExpression=this.escapeExpression;
return " <textarea class='body-textarea' readonly='readonly' placeholder='(required)' name='"
return " <textarea class='body-textarea' readonly='readonly' placeholder='(required)' name='"
+ escapeExpression(((helper = (helper = helpers.name || (depth0 != null ? depth0.name : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"name","hash":{},"data":data}) : helper)))
+ "'>"
+ escapeExpression(((helper = (helper = helpers['default'] || (depth0 != null ? depth0['default'] : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"default","hash":{},"data":data}) : helper)))

File diff suppressed because one or more lines are too long

View File

@@ -7,7 +7,7 @@ Handlebars.registerHelper('sanitize', function(html) {
});
Handlebars.registerHelper('renderTextParam', function(param) {
var result;
var result, type = 'text';
var isArray = param.type.toLowerCase() === 'array' || param.allowMultiple;
var defaultValue = isArray && Array.isArray(param.default) ? param.default.join('\n') : param.default;
@@ -15,6 +15,10 @@ Handlebars.registerHelper('renderTextParam', function(param) {
defaultValue = '';
}
if(param.format && param.format === 'password') {
type = 'password';
}
if(isArray) {
result = '<textarea class=\'body-textarea' + (param.required ? ' required' : '') + '\' name=\'' + param.name + '\'';
result += ' placeholder=\'Provide multiple values in new lines' + (param.required ? ' (at least one required).' : '.') + '\'>';
@@ -22,7 +26,7 @@ Handlebars.registerHelper('renderTextParam', function(param) {
} else {
result = '<input class=\'parameter\'' + (param.required ? ' class=\'required\'' : '') + ' minlength=\'' + (param.required ? 1 : 0) + '\'';
result += ' name=\'' + param.name +'\' placeholder=\'' + (param.required ? '(required)' : '') + '\'';
result += ' type=\'text\' value=\'' + defaultValue + '\'/>';
result += ' type=\'' + type + '\' value=\'' + defaultValue + '\'/>';
}
return new Handlebars.SafeString(result);
});

View File

@@ -1,7 +1,7 @@
<td class='code required'>{{name}}</td>
<td>
{{#if isBody}}
<textarea class='body-textarea' readonly='readonly' placeholder='(required)' name='{{name}}'>{{default}}</textarea>
<textarea class='body-textarea' readonly='readonly' placeholder='(required)' name='{{name}}'>{{default}}</textarea>
{{else}}
{{#if default}}
{{default}}

View File

@@ -594,7 +594,8 @@
"name": "password",
"description": "The password for login in clear text",
"required": false,
"type": "string"
"type": "string",
"format": "password"
}
],
"responses": {