From 1696a1ba3419d1f3d3ea217e338d3b009d78f192 Mon Sep 17 00:00:00 2001 From: Tony Tam Date: Fri, 8 May 2015 12:06:56 -0700 Subject: [PATCH] added fix from outdated PR #1122 --- dist/swagger-ui.js | 14 ++++++++------ dist/swagger-ui.min.js | 2 +- src/main/javascript/view/OperationView.js | 8 ++++---- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/dist/swagger-ui.js b/dist/swagger-ui.js index f532c657..595740ed 100644 --- a/dist/swagger-ui.js +++ b/dist/swagger-ui.js @@ -20867,7 +20867,9 @@ SwaggerUi.Views.MainView = Backbone.View.extend({ } else { // 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) { return this.handleFileUpload(map, form); } 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 = $('