Merge pull request swagger-api#739 from swagger-api/develop

Standardized default value across both spec versions
nouse · Nov 22, 2014 · c7fc5d1 · c7fc5d1
2 parents 932f4e3 + 091eca5
commit c7fc5d1
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 16 deletions.
diff --git a/dist/swagger-ui.js b/dist/swagger-ui.js
@@ -1575,8 +1575,8 @@ helpers = this.merge(helpers, Handlebars.helpers); data = data || {};
       if (this.model.swaggerVersion === "2.0") {
         if ("validatorUrl" in opts.swaggerOptions) {
           return this.model.validatorUrl = opts.swaggerOptions.validatorUrl;
-        } else if (this.model.url.match(/https?:\/\/localhost/)) {
-          return this.model.validatorUrl = this.model.url;
+        } else if (this.model.url.indexOf("localhost") > 0) {
+          return this.model.validatorUrl = null;
         } else {
           return this.model.validatorUrl = "http://online.swagger.io/validator";
         }

diff --git a/dist/swagger-ui.min.js b/dist/swagger-ui.min.js
diff --git a/src/main/coffeescript/view/MainView.coffee b/src/main/coffeescript/view/MainView.coffee
@@ -29,9 +29,9 @@ class MainView extends Backbone.View
       if "validatorUrl" of opts.swaggerOptions
         # Validator URL specified explicitly
         @model.validatorUrl = opts.swaggerOptions.validatorUrl
-      else if @model.url.match(/https?:\/\/localhost/)
+      else if @model.url.indexOf("localhost") > 0
         # Localhost override
-        @model.validatorUrl = @model.url
+        @model.validatorUrl = null
       else
         # Default validator
         @model.validatorUrl = "http://online.swagger.io/validator"

diff --git a/src/main/template/param_list.handlebars b/src/main/template/param_list.handlebars
@@ -3,7 +3,7 @@
   <select {{#isArray this}} multiple='multiple'{{/isArray}} class='parameter' name='{{name}}'>
     {{#if required}}
     {{else}}
-      {{#if defaultValue}}
+      {{#if default}}
       {{else}}
         {{#isArray this}}
         {{else}}

diff --git a/src/main/template/param_readonly.handlebars b/src/main/template/param_readonly.handlebars
@@ -1,10 +1,10 @@
 <td class='code'>{{name}}</td>
 <td>
     {{#if isBody}}
-        <textarea class='body-textarea' readonly='readonly' name='{{name}}'>{{defaultValue}}</textarea>
+        <textarea class='body-textarea' readonly='readonly' name='{{name}}'>{{default}}</textarea>
     {{else}}
-        {{#if defaultValue}}
-            {{defaultValue}}
+        {{#if default}}
+            {{default}}
         {{else}}
             (empty)
         {{/if}}

diff --git a/src/main/template/param_readonly_required.handlebars b/src/main/template/param_readonly_required.handlebars
@@ -1,10 +1,10 @@
 <td class='code required'>{{name}}</td>
 <td>
     {{#if isBody}}
-        <textarea class='body-textarea'  readonly='readonly' placeholder='(required)' name='{{name}}'>{{defaultValue}}</textarea>
+        <textarea class='body-textarea'  readonly='readonly' placeholder='(required)' name='{{name}}'>{{default}}</textarea>
     {{else}}
-        {{#if defaultValue}}
-            {{defaultValue}}
+        {{#if default}}
+            {{default}}
         {{else}}
             (empty)
         {{/if}}

diff --git a/src/main/template/param_required.handlebars b/src/main/template/param_required.handlebars
@@ -4,8 +4,8 @@
 		{{#if isFile}}
 			<input type="file" name='{{name}}'/>
 		{{else}}
-			{{#if defaultValue}}
-				<textarea class='body-textarea' placeholder='(required)' name='{{name}}'>{{defaultValue}}</textarea>
+			{{#if default}}
+				<textarea class='body-textarea' placeholder='(required)' name='{{name}}'>{{default}}</textarea>
 			{{else}}
 				<textarea class='body-textarea' placeholder='(required)' name='{{name}}'></textarea>
 				<br />
@@ -16,8 +16,8 @@
 		{{#if isFile}}
 			<input class='parameter' class='required' type='file' name='{{name}}'/>
 		{{else}}
-			{{#if defaultValue}}
-				<input class='parameter required' minlength='1' name='{{name}}' placeholder='(required)' type='text' value='{{defaultValue}}'/>
+			{{#if default}}
+				<input class='parameter required' minlength='1' name='{{name}}' placeholder='(required)' type='text' value='{{default}}'/>
 			{{else}}
 				<input class='parameter required' minlength='1' name='{{name}}' placeholder='(required)' type='text' value=''/>
 			{{/if}}