updated validator badge logic per #1299

This commit is contained in:
Tony Tam
2015-05-19 11:28:21 -07:00
parent b5039b28b0
commit bcf52d351b
3 changed files with 27 additions and 35 deletions

12
dist/swagger-ui.js vendored
View File

@@ -20940,23 +20940,19 @@ SwaggerUi.Views.MainView = Backbone.View.extend({
}); });
} }
if (this.model.swaggerVersion === '2.0') {
if ('validatorUrl' in opts.swaggerOptions) { if ('validatorUrl' in opts.swaggerOptions) {
// Validator URL specified explicitly // Validator URL specified explicitly
this.model.validatorUrl = opts.swaggerOptions.validatorUrl; this.model.validatorUrl = opts.swaggerOptions.validatorUrl;
} else if (this.model.url.indexOf('localhost') > 0) { } else if (this.model.url.indexOf('localhost') > 0) {
// Localhost override // Localhost override
this.model.validatorUrl = null; this.model.validatorUrl = null;
} else { } else {
// Default validator // Default validator
if(window.location.protocol.indexOf('http') === 0) { if(window.location.protocol === 'https') {
this.model.validatorUrl = window.location.protocol + '//online.swagger.io/validator'; this.model.validatorUrl = 'https://online.swagger.io/validator';
} }
else {
this.model.validatorUrl = 'http://online.swagger.io/validator';
} }
} }
}, },

File diff suppressed because one or more lines are too long

View File

@@ -54,23 +54,19 @@ SwaggerUi.Views.MainView = Backbone.View.extend({
}); });
} }
if (this.model.swaggerVersion === '2.0') {
if ('validatorUrl' in opts.swaggerOptions) { if ('validatorUrl' in opts.swaggerOptions) {
// Validator URL specified explicitly // Validator URL specified explicitly
this.model.validatorUrl = opts.swaggerOptions.validatorUrl; this.model.validatorUrl = opts.swaggerOptions.validatorUrl;
} else if (this.model.url.indexOf('localhost') > 0) { } else if (this.model.url.indexOf('localhost') > 0) {
// Localhost override // Localhost override
this.model.validatorUrl = null; this.model.validatorUrl = null;
} else { } else {
// Default validator // Default validator
if(window.location.protocol.indexOf('http') === 0) { if(window.location.protocol === 'https') {
this.model.validatorUrl = window.location.protocol + '//online.swagger.io/validator'; this.model.validatorUrl = 'https://online.swagger.io/validator';
} }
else {
this.model.validatorUrl = 'http://online.swagger.io/validator';
} }
} }
}, },