Merge branch 'ponelat-fix/xss-index-html' into develop_2.0

This commit is contained in:
Tony Tam
2015-06-03 22:47:46 -07:00
3 changed files with 7 additions and 6 deletions

5
dist/swagger-ui.js vendored
View File

@@ -20675,7 +20675,7 @@ window.SwaggerUi = Backbone.Router.extend({
} }
$('#message-bar').removeClass('message-fail'); $('#message-bar').removeClass('message-fail');
$('#message-bar').addClass('message-success'); $('#message-bar').addClass('message-success');
$('#message-bar').html(data); $('#message-bar').text(data);
}, },
// shows message in red // shows message in red
@@ -20686,7 +20686,7 @@ window.SwaggerUi = Backbone.Router.extend({
$('#message-bar').removeClass('message-success'); $('#message-bar').removeClass('message-success');
$('#message-bar').addClass('message-fail'); $('#message-bar').addClass('message-fail');
var val = $('#message-bar').html(data); var val = $('#message-bar').text(data);
if (this.options.onFailure) { if (this.options.onFailure) {
this.options.onFailure(data); this.options.onFailure(data);
@@ -20763,6 +20763,7 @@ window.SwaggerUi.Views = {};
}(this, function () { }(this, function () {
return SwaggerUi; return SwaggerUi;
})); }));
'use strict'; 'use strict';
SwaggerUi.Views.ApiKeyButton = Backbone.View.extend({ // TODO: append this to global SwaggerUi SwaggerUi.Views.ApiKeyButton = Backbone.View.extend({ // TODO: append this to global SwaggerUi

File diff suppressed because one or more lines are too long

View File

@@ -175,7 +175,7 @@ window.SwaggerUi = Backbone.Router.extend({
} }
$('#message-bar').removeClass('message-fail'); $('#message-bar').removeClass('message-fail');
$('#message-bar').addClass('message-success'); $('#message-bar').addClass('message-success');
$('#message-bar').html(data); $('#message-bar').text(data);
}, },
// shows message in red // shows message in red
@@ -186,7 +186,7 @@ window.SwaggerUi = Backbone.Router.extend({
$('#message-bar').removeClass('message-success'); $('#message-bar').removeClass('message-success');
$('#message-bar').addClass('message-fail'); $('#message-bar').addClass('message-fail');
var val = $('#message-bar').html(data); var val = $('#message-bar').text(data);
if (this.options.onFailure) { if (this.options.onFailure) {
this.options.onFailure(data); this.options.onFailure(data);
@@ -262,4 +262,4 @@ window.SwaggerUi.Views = {};
} }
}(this, function () { }(this, function () {
return SwaggerUi; return SwaggerUi;
})); }));