diff --git a/.travis.yml b/.travis.yml
index 37245c73..9d82df84 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -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
diff --git a/README.md b/README.md
index 876e5397..044b96cc 100644
--- a/README.md
+++ b/README.md
@@ -62,7 +62,7 @@ This will start Swagger UI at `http://localhost:8080`.
Once you open the Swagger UI, it will load the [Swagger Petstore](http://petstore.swagger.io/v2/swagger.json) service and show its APIs. You can enter your own server url and click explore to view the API.
### Customize
-You may choose to customize Swagger UI for your organization. Here is an overview of whats in its various directories:
+You may choose to customize Swagger UI for your organization. Here is an overview of what's in its various directories:
- dist: Contains a distribution which you can deploy on a server or load from your local machine.
- dist/lang: The swagger localization
diff --git a/dist/swagger-ui.js b/dist/swagger-ui.js
index 8c6fe138..e2bfd51f 100644
--- a/dist/swagger-ui.js
+++ b/dist/swagger-ui.js
@@ -250,7 +250,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) {
@@ -24888,9 +24889,10 @@ SwaggerUi.Views.BasicAuthButton = Backbone.View.extend({
'click #apply_basic_auth' : 'applyPassword'
},
- applyPassword: function(){
- var username = $('.input_username').val();
- var password = $('.input_password').val();
+ applyPassword: function(event){
+ event.preventDefault();
+ var username = $('#input_username').val();
+ var password = $('#input_password').val();
var basicAuth = new SwaggerClient.PasswordAuthorization('basic', username, password);
this.router.api.clientAuthorizations.add(this.model.type, basicAuth);
this.router.load();
diff --git a/dist/swagger-ui.min.js b/dist/swagger-ui.min.js
index 87b5059a..d58fe899 100644
--- a/dist/swagger-ui.min.js
+++ b/dist/swagger-ui.min.js
@@ -1,10 +1,10 @@
-(function(){function e(){e.history=e.history||[],e.history.push(arguments),this.console&&console.log(Array.prototype.slice.call(arguments)[0])}this.Handlebars=this.Handlebars||{},this.Handlebars.templates=this.Handlebars.templates||{},this.Handlebars.templates.apikey_button_view=Handlebars.template({compiler:[6,">= 2.0.0-beta.1"],main:function(e,t,n,r){var i,a="function",o=t.helperMissing,s=this.escapeExpression;return"\n