Merge pull request #1769 from swagger-api/brentonmcs-master

Rebased @brentonmcs fix on latest master
This commit is contained in:
Tony Tam
2015-11-21 08:26:24 -10:00
5 changed files with 9977 additions and 3763 deletions

View File

@@ -1,8 +1,7 @@
sudo: false
language: node_js
node_js:
- '0.10'
- '0.12'
- '4.2'
install:
- export DISPLAY=:99.0
- sh -e /etc/init.d/xvfb start

13706
dist/swagger-ui.js vendored

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@@ -1,7 +1,9 @@
'use strict';
var pack = require('./package');
var path = require('path');
module.exports = {
version: pack.version,
dist: path.resolve(__dirname, 'dist')
};
};

View File

@@ -8,7 +8,8 @@ Handlebars.registerHelper('sanitize', function(html) {
Handlebars.registerHelper('renderTextParam', function(param) {
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 dataVendorExtensions = Object.keys(param).filter(function(property) {