Skip to content

Commit

Permalink
Merge pull request kobotoolbox#2107 from kobotoolbox/683-do-not-strip
Browse files Browse the repository at this point in the history
Do not strip HTML from labels in Form Builder
  • Loading branch information
jnm authored Dec 8, 2018
2 parents 2f056a3 + 232ea08 commit ccd0689
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion jsapp/xlform/src/view.row.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ module.exports = do ->
if value == ''
return newValue: new Array(10).join(' ')
else
return newValue: value;
return newValue: value;

class RowView extends BaseRowView
_expandedRender: ->
Expand Down
2 changes: 1 addition & 1 deletion jsapp/xlform/src/view.utils.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ module.exports = do ->
if new_value.newValue?
edit_box.remove()
selector.show()
selector.html new_value.newValue
selector.html(_.escape(new_value.newValue))
else
error_box = $('<div class="error-message">' + new_value + '</div>')
parent_element.append(error_box)
Expand Down

0 comments on commit ccd0689

Please sign in to comment.