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

Merge pull request #1275 from swagger-api/develop_2.0

Browse Source 
Merged from develop_2.0
This commit is contained in:
Tony Tam
2015-05-13 07:31:32 -04:00
parent 9d8ccc40dc bf7164119b
commit d3bc023302
5 changed files with 25 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bower.json
View File

@@ -1,7 +1,7 @@
{ {
"name": "swagger-ui", "name": "swagger-ui",
"main": "dist/index.html", "main": "dist/index.html",
"version": "2.1.8-M1", "version": "2.1.3-M2",
"authors": [ "authors": [
"Mohsen Azimi <me@azimi.me>" "Mohsen Azimi <me@azimi.me>"
], ],

22
dist/swagger-ui.js vendored
View File

File diff suppressed because one or more lines are too long

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

File diff suppressed because one or more lines are too long

4
package.json
View File

@@ -8,7 +8,7 @@
} }
], ],
"description": "Swagger UI is a dependency-free collection of HTML, JavaScript, and CSS assets that dynamically generate beautiful documentation from a Swagger-compliant API", "description": "Swagger UI is a dependency-free collection of HTML, JavaScript, and CSS assets that dynamically generate beautiful documentation from a Swagger-compliant API",
"version": "2.1.2-M2", "version": "2.1.3-M2",
"homepage": "http://swagger.io", "homepage": "http://swagger.io",
"license": "Apache 2.0", "license": "Apache 2.0",
"main": "dist/swagger-ui.js", "main": "dist/swagger-ui.js",
@@ -50,6 +50,6 @@
"less": "^2.4.0", "less": "^2.4.0",
"mocha": "^2.1.0", "mocha": "^2.1.0",
"selenium-webdriver": "^2.45.0", "selenium-webdriver": "^2.45.0",
"swagger-client": "2.1.4-M2" "swagger-client": "2.1.5-M2"
} }
} }

6
src/main/javascript/helpers/handlebars.js
View File

@@ -24,7 +24,11 @@ Handlebars.registerHelper('renderTextParam', function(param) {
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).' : '.') + '\'>';
result += defaultValue + '</textarea>'; result += defaultValue + '</textarea>';
} else { } else {
result = '<input class=\'parameter\'' + (param.required ? ' class=\'required\'' : '') + ' minlength=\'' + (param.required ? 1 : 0) + '\''; var parameterClass = 'parameter';
if(param.required) {
parameterClass += ' required';
}
result = '<input class=\'' + parameterClass + '\' minlength=\'' + (param.required ? 1 : 0) + '\'';
result += ' name=\'' + param.name +'\' placeholder=\'' + (param.required ? '(required)' : '') + '\''; result += ' name=\'' + param.name +'\' placeholder=\'' + (param.required ? '(required)' : '') + '\'';
result += ' type=\'' + type + '\' value=\'' + defaultValue + '\'/>'; result += ' type=\'' + type + '\' value=\'' + defaultValue + '\'/>';
} }