merged from develop, added fix for #627

This commit is contained in:
Tony Tam
2014-12-02 22:24:47 -08:00
parent 855c015a3f
commit 6961dd7f92
8 changed files with 75 additions and 27 deletions

View File

@@ -157,6 +157,13 @@ class OperationView extends Backbone.View
$(@).wiggle
callback: => $(@).focus()
error_free = false
form.find("textarea.required").each ->
$(@).removeClass "error"
if jQuery.trim($(@).val()) is ""
$(@).addClass "error"
$(@).wiggle
callback: => $(@).focus()
error_free = false
# if error free submit it
if error_free
@@ -420,5 +427,5 @@ class OperationView extends Backbone.View
if opts.highlightSizeThreshold && response.data.length > opts.highlightSizeThreshold then response_body_el else hljs.highlightBlock(response_body_el)
toggleOperationContent: ->
elem = $('#' + Docs.escapeResourceName(@model.parentId) + "_" + @model.nickname + "_content")
elem = $('#' + Docs.escapeResourceName(@model.parentId + "_" + @model.nickname + "_content"))
if elem.is(':visible') then Docs.collapseOperation(elem) else Docs.expandOperation(elem)

View File

@@ -5,9 +5,9 @@
<input type="file" name='{{name}}'/>
{{else}}
{{#if default}}
<textarea class='body-textarea' placeholder='(required)' name='{{name}}'>{{default}}</textarea>
<textarea class='body-textarea required' placeholder='(required)' name='{{name}}'>{{default}}</textarea>
{{else}}
<textarea class='body-textarea' placeholder='(required)' name='{{name}}'></textarea>
<textarea class='body-textarea required' placeholder='(required)' name='{{name}}'></textarea>
<br />
<div class="parameter-content-type" />
{{/if}}