Merge remote-tracking branch 'upstream/develop_2.0' into JSONEditor

Conflicts: dist/swagger-ui.js dist/swagger-ui.min.js
2015-04-20 10:16:54 +02:00
parent 801acf07e3 82a89a7952
commit f3ee0a436c
49 changed files with 103 additions and 5198 deletions
--- a/src/main/javascript/view/MainView.js
+++ b/src/main/javascript/view/MainView.js
@@ -68,7 +68,7 @@ SwaggerUi.Views.MainView = Backbone.View.extend({
      } else {

        // Default validator
-        this.model.validatorUrl = 'http://online.swagger.io/validator';
+        this.model.validatorUrl = window.location.protocol + '//online.swagger.io/validator';
      }
    }