Merge branch 'master' of https://github.com/synrc/nitro

src/actions/action_wire.erl

@@ -8,4 +8,4 @@ render_action(S) when is_list(S) -> S;
 render_action(_) -> [].
 
 wire(A) -> Actions = case get(actions) of undefined -> []; E -> E end,
-           put(actions,Actions++[#wire{actions=A}]).
+           put(actions,Actions++[#wire{actions=A}]), [].

src/elements/element_button.erl

@@ -11,7 +11,7 @@ render_element(Record) ->
           wf:wire(#event{type=click, postback=Postback, target=ID,
                   source=Record#button.source, delegate=Record#button.delegate }),
           ID end,
-    wf_tags:emit_tag(<<"button">>, wf:render(Record#button.body), [
+    wf_tags:emit_tag(<<"button">>, nitro:render(Record#button.body), [
         {<<"id">>, Id},
         {<<"type">>, Record#button.type},
         {<<"name">>, Record#button.name},