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

8
dist/swagger-ui.js vendored
View File

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

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

View File

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