kyy/swagger-ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #739 from swagger-api/develop

Browse Source 
Standardized default value across both spec versions
This commit is contained in:
Tony Tam
2014-11-22 07:58:48 -10:00
parent 932f4e35aa 091eca50d9
commit c7fc5d1b65
7 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
dist/swagger-ui.js vendored
View File

@@ -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";
}

2
dist/swagger-ui.min.js vendored
View File

File diff suppressed because one or more lines are too long

4
src/main/coffeescript/view/MainView.coffee
View File

@@ -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"

2
src/main/template/param_list.handlebars
View File

@@ -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}}

6
src/main/template/param_readonly.handlebars
View File

@@ -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}}

6
src/main/template/param_readonly_required.handlebars
View File

@@ -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}}

8
src/main/template/param_required.handlebars
View File

@@ -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}}