Merge branch 'fix-1109' into develop_2.0

This commit is contained in:
Tony Tam
2015-04-15 12:26:43 -07:00
4 changed files with 389 additions and 397 deletions

6
dist/index.html vendored
View File

@@ -69,15 +69,11 @@
/*
var apiKey = "myApiKeyXXXX123456789";
$('#input_apiKey').val(apiKey);
addApiKeyAuthorization();
*/
window.swaggerUi.load();
// Add authorization if auth input is not empty
if ($('#input_apiKey').val().length) {
addApiKeyAuthorization();
}
function log() {
if ('console' in window) {
console.log.apply(console, arguments);

756
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

@@ -593,6 +593,12 @@ SwaggerUi.Views.OperationView = Backbone.View.extend({
code = $('<code />').html(_.escape(content));
pre = $('<pre class="xml" />').append(code);
// Plain Text
} else if (/text\/plain/.test(contentType)) {
code = $('<code />').text(content);
pre = $('<pre class="plain" />').append(code);
// Image
} else if (/^image\//.test(contentType)) {
pre = $('<img>').attr('src', url);