Merge branch 'fix-1160' into develop_2.0

dist/index.html

@@ -63,17 +63,21 @@
         }
       }
 
-      window.swaggerUi.load();
-      
       $('#input_apiKey').change(addApiKeyAuthorization);
 
       // if you have an apiKey you would like to pre-populate on the page for demonstration purposes...
       /*
         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);

dist/swagger-ui.js

@@ -20692,7 +20692,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';
       }
     }
   },

src/main/html/index.html

@@ -69,11 +69,15 @@
       /*
         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);