Merge branch 'master' into fix-fields-basic-auth
This commit is contained in:
@@ -1,8 +1,7 @@
|
|||||||
sudo: false
|
sudo: false
|
||||||
language: node_js
|
language: node_js
|
||||||
node_js:
|
node_js:
|
||||||
- '0.10'
|
- '4.2'
|
||||||
- '0.12'
|
|
||||||
install:
|
install:
|
||||||
- export DISPLAY=:99.0
|
- export DISPLAY=:99.0
|
||||||
- sh -e /etc/init.d/xvfb start
|
- sh -e /etc/init.d/xvfb start
|
||||||
|
|||||||
13672
dist/swagger-ui.js
vendored
13672
dist/swagger-ui.js
vendored
File diff suppressed because one or more lines are too long
23
dist/swagger-ui.min.js
vendored
23
dist/swagger-ui.min.js
vendored
File diff suppressed because one or more lines are too long
2
index.js
2
index.js
@@ -1,3 +1,5 @@
|
|||||||
|
'use strict';
|
||||||
|
|
||||||
var pack = require('./package');
|
var pack = require('./package');
|
||||||
var path = require('path');
|
var path = require('path');
|
||||||
|
|
||||||
|
|||||||
@@ -8,7 +8,8 @@ Handlebars.registerHelper('sanitize', function(html) {
|
|||||||
|
|
||||||
Handlebars.registerHelper('renderTextParam', function(param) {
|
Handlebars.registerHelper('renderTextParam', function(param) {
|
||||||
var result, type = 'text', idAtt = '';
|
var result, type = 'text', idAtt = '';
|
||||||
var isArray = param.type.toLowerCase() === 'array' || param.allowMultiple;
|
var paramType = param.type || param.schema.type || '';
|
||||||
|
var isArray = paramType.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;
|
||||||
|
|
||||||
var dataVendorExtensions = Object.keys(param).filter(function(property) {
|
var dataVendorExtensions = Object.keys(param).filter(function(property) {
|
||||||
|
|||||||
Reference in New Issue
Block a user