added fix from outdated PR swagger-api#1122

Digital-Paw · May 8, 2015 · 4cbaddd · 4cbaddd
1 parent f566755
commit 4cbaddd
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/swagger-ui.js b/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 = $('<audio controls>').append($('<source>').attr('src', url).attr('type', contentType));
 
     // Download
-    } else if (headers['Content-Disposition'].test(/attachment/) ||
-               headers['content-disposition'].test(/attachment/) ||
-               headers['Content-Description'].test(/File Transfer/) ||
-               headers['content-description'].test(/File Transfer/)) {
+    } else if ((headers['Content-Disposition'] && headers['Content-Disposition'].test(/attachment/)) ||
+               (headers['content-disposition'] && headers['content-disposition'].test(/attachment/)) ||
+               (headers['Content-Description'] && headers['Content-Description'].test(/File Transfer/)) ||
+               (headers['content-description'] && headers['content-description'].test(/File Transfer/))) {
 
       if ('Blob' in window) {
         var type = contentType || 'text/html';