kyy/swagger-ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

added fix from outdated PR #1122

Browse Source
This commit is contained in:
Tony Tam
2015-05-08 12:06:56 -07:00
parent ba855e3d04
commit 1696a1ba34
3 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
dist/swagger-ui.js vendored
View File

@@ -20867,7 +20867,9 @@ SwaggerUi.Views.MainView = Backbone.View.extend({
} else { } else {
// Default validator // Default validator
this.model.validatorUrl = window.location.protocol + '//online.swagger.io/validator'; if(window.location.protocol.startsWith('http')) {
this.model.validatorUrl = window.location.protocol + '//online.swagger.io/validator';
}
} }
} }
}, },
@@ -21252,7 +21254,7 @@ SwaggerUi.Views.OperationView = Backbone.View.extend({
if (isFileUpload) { if (isFileUpload) {
return this.handleFileUpload(map, form); return this.handleFileUpload(map, form);
} else { } else {
return this.model['do'](map, opts, this.showCompleteStatus, this.showErrorStatus, this); return this.model.execute(map, this.options.swaggerOptions || {}, this.showCompleteStatus, this.showErrorStatus, this);
} }
} }
}, },
@@ -21547,10 +21549,10 @@ SwaggerUi.Views.OperationView = Backbone.View.extend({
pre = $('<audio controls>').append($('<source>').attr('src', url).attr('type', contentType)); pre = $('<audio controls>').append($('<source>').attr('src', url).attr('type', contentType));
// Download // Download
} else if (headers['Content-Disposition'].test(/attachment/) || } else if ((headers['Content-Disposition'] && headers['Content-Disposition'].test(/attachment/)) ||
headers['content-disposition'].test(/attachment/) || (headers['content-disposition'] && headers['content-disposition'].test(/attachment/)) ||
headers['Content-Description'].test(/File Transfer/) || (headers['Content-Description'] && headers['Content-Description'].test(/File Transfer/)) ||
headers['content-description'].test(/File Transfer/)) { (headers['content-description'] && headers['content-description'].test(/File Transfer/))) {
if ('Blob' in window) { if ('Blob' in window) {
var type = contentType || 'text/html'; var type = contentType || 'text/html';

2
dist/swagger-ui.min.js vendored
View File

File diff suppressed because one or more lines are too long

8
src/main/javascript/view/OperationView.js
View File

@@ -608,10 +608,10 @@ SwaggerUi.Views.OperationView = Backbone.View.extend({
pre = $('<audio controls>').append($('<source>').attr('src', url).attr('type', contentType)); pre = $('<audio controls>').append($('<source>').attr('src', url).attr('type', contentType));
// Download // Download
} else if (headers['Content-Disposition'].test(/attachment/) || } else if ((headers['Content-Disposition'] && headers['Content-Disposition'].test(/attachment/)) ||
headers['content-disposition'].test(/attachment/) || (headers['content-disposition'] && headers['content-disposition'].test(/attachment/)) ||
headers['Content-Description'].test(/File Transfer/) || (headers['Content-Description'] && headers['Content-Description'].test(/File Transfer/)) ||
headers['content-description'].test(/File Transfer/)) { (headers['content-description'] && headers['content-description'].test(/File Transfer/))) {
if ('Blob' in window) { if ('Blob' in window) {
var type = contentType || 'text/html'; var type = contentType || 'text/html';