nitro mqtt

include/nitro.hrl

@@ -1,11 +1,6 @@
 -ifndef(NITRO_HRL).
 -define(NITRO_HRL, true).
 
--record(cx,      { handlers, actions, req, module, lang, path, session, formatter=false, params, form, state=[] }).
-
--define(CTX, (get(context))).
--define(REQ, (get(context))#cx.req).
-
 -define(DEFAULT_BASE, {?ELEMENT_BASE(undefined)}).
 -define(DEFAULT_BASE_TAG(Tag), {?ELEMENT_BASE(undefined,Tag,undefined)}).
 -define(ELEMENT_BASE(Module), ?ELEMENT_BASE(Module,undefined,undefined)).

src/elements/element_upload.erl

@@ -3,9 +3,9 @@
 -include_lib("nitro/include/nitro.hrl").
 
 render_element(#upload{id=Id}) ->
-    Uid = case Id of undefined -> wf:temp_id(); I -> I end,
+    Uid = case Id of undefined -> n2o:temp_id(); I -> I end,
     nitro:wire("ftp_file=undefined;"),
-    bind(ftp_open,  click,  wf:f("qi('~s').click(); event.preventDefault();", [wf:to_list(Uid)])),
+    bind(ftp_open,  click,  nitro:f("qi('~s').click(); event.preventDefault();", [nitro:to_list(Uid)])),
     bind(ftp_start, click,  "ftp.start(ftp_file);"),
     bind(ftp_stop,  click,  "ftp.stop(ftp_file);"),
     bind(nitro:to_atom(Uid), change, "ftp_file=ftp.init(this.files[0]);"),
@@ -16,7 +16,7 @@ render_element(#upload{id=Id}) ->
              #button { id   = ftp_open,    body = "Browse" },
              #button { id   = ftp_start,   body = "Upload" },
              #button { id   = ftp_stop,    body = "Stop" }
-    ] } ] }, wf:render(Upload).
+    ] } ] }, n2o:render(Upload).
 
 bind(Control,Event,Code) ->
     nitro:wire(#bind{target=Control,type=Event,postback=Code}).

src/nitro.erl

@@ -1,4 +1,5 @@
 -module(nitro).
+-include_lib("n2o/include/n2o.hrl").
 -include("nitro.hrl").
 -compile(export_all).
 -behaviour(application).
@@ -169,9 +170,9 @@ header(K,V) -> nitro:context((?CTX)#cx{req=cowboy_req:set_resp_header(K,V,?REQ)}
 
 % Convert and Utils API
 
-display(Element,Status) -> 
+display(Element,Status) ->
    nitro:wire("{ var x = qi('"++
-      nitro:to_list(Element)++"'); if (x) x.style.display = '"++nitro:to_list(Status)++"'; }").
+   nitro:to_list(Element)++"'); if (x) x.style.display = '"++nitro:to_list(Status)++"'; }").
 
 show(Element) -> display(Element,block).
 hide(Element) -> display(Element,none).

src/render/wf_render.erl

@@ -2,10 +2,18 @@
 -include_lib("nitro/include/nitro.hrl").
 -compile(export_all).
 
-render_item(E) when element(2,E) == element -> wf_render_elements:render_element(E);
-render_item(E) when element(2,E) == action  -> wf_render_actions:render_action(E);
-render_item(E) -> E.
+render_item(undefined) -> <<>>;
+render_item(E) when element(2,E) =:= element -> wf_render_elements:render_element(E);
+render_item(E) when element(2,E) =:= action  ->
+    io:format("Render Action: ~p~n",[E]),
+    wf_render_actions:render_action(E);
+render_item(E) ->
+    io:format("Render Item: ~p~n",[E]),
+    E.
+
+render(undefined) -> <<>>;
 render(<<E/binary>>) -> E;
-render(undefined) -> [];
-render(Elements) when is_list(Elements) -> [ render_item(E) || E <- lists:flatten(Elements) ];
+render(Elements) when is_list(Elements) ->
+    io:format("Render: ~p~n",[Elements]),
+   [ render_item(E) || E <- Elements, E /= undefined ];
 render(Elements) -> render_item(Elements).