Browse Source

Merge pull request #2 from schutm/master

Add html_encode to literal
Namdak Tonpa 9 years ago
parent
commit
72ec6041a9
2 changed files with 6 additions and 2 deletions
  1. 1 1
      include/nitro.hrl
  2. 5 1
      src/elements/element_literal.erl

+ 1 - 1
include/nitro.hrl

@@ -12,7 +12,7 @@
 -define(CTRL_BASE(Module), ?ELEMENT_BASE(Module,undefined,Module)).
 -define(CTRL_BASE(Module), ?ELEMENT_BASE(Module,undefined,Module)).
 
 
 -record(element, {?ELEMENT_BASE(undefined)}).
 -record(element, {?ELEMENT_BASE(undefined)}).
--record(literal, {?ELEMENT_BASE(element_literal)}).
+-record(literal, {?ELEMENT_BASE(element_literal), html_encode=true }).
 -record(dtl, {?ELEMENT_BASE(element_dtl), file="index", bindings=[], app=web, folder="priv/templates", ext="html", bind_script=true, js_escape=false }).
 -record(dtl, {?ELEMENT_BASE(element_dtl), file="index", bindings=[], app=web, folder="priv/templates", ext="html", bind_script=true, js_escape=false }).
 -record(list, {?ELEMENT_BASE(element_list), numbered=false }).
 -record(list, {?ELEMENT_BASE(element_list), numbered=false }).
 -record(dropdown, {?ELEMENT_BASE(element_dropdown), options, value, multiple=false, disabled=false, name}).
 -record(dropdown, {?ELEMENT_BASE(element_dropdown), options, value, multiple=false, disabled=false, name}).

+ 5 - 1
src/elements/element_literal.erl

@@ -3,4 +3,8 @@
 -include_lib("nitro/include/nitro.hrl").
 -include_lib("nitro/include/nitro.hrl").
 -compile(export_all).
 -compile(export_all).
 
 
-render_element(Record) -> nitro:html_encode(Record#literal.body).
+render_element(Record = #literal{}) ->
+	case Record#literal.html_encode of
+		true -> nitro:html_encode(Record#literal.body);
+		_    -> Record#literal.body
+	end.