split actions and elements by includes

include/nitro.hrl

@@ -194,21 +194,4 @@
 -record(message,		?DEFAULT_BASE).
 -record(author,		    ?DEFAULT_BASE).
 
-% Actions
--record(action,  {?ACTION_BASE(undefined)}).
--record(wire,    {?ACTION_BASE(action_wire)}).
-
--record(replace, {?ACTION_BASE(action_manage), elements}).
--record(insert,  {?ACTION_BASE(action_manage), elements, position = beforeend}).
--record(multi,   {?ACTION_BASE(action_manage)}).
--record(focus,   {?ACTION_BASE(action_ui)}).
-
--record(api,     {?ACTION_BASE(action_api), name, tag, delegate }).
--record(event,   {?ACTION_BASE(action_event), type=default, postback, delegate, validation=[]}).
--record(bind,    {?ACTION_BASE(action_bind), type=click, postback}).
--record(alert,   {?ACTION_BASE(action_alert), text}).
--record(confirm, {?ACTION_BASE(action_confirm), text, postback, delegate}).
--record(jq,      {?ACTION_BASE(action_jq), property, method, args=[], right, format="~s"}).
--record(transfer,{?ACTION_BASE(action_transfer), state, events=[] }).
-
 -endif.

src/actions/action_alert.erl

@@ -1,6 +1,7 @@
 -module(action_alert).
 -author('Rusty Klophaus').
 -include_lib("nitro/include/nitro.hrl").
+-include_lib("nitro/include/event.hrl").
 -compile(export_all).
 
 render_action(#alert{text=T}) -> ["alert(\"",nitro:js_escape(T),"\");"].

src/actions/action_api.erl

@@ -1,6 +1,7 @@
 -module(action_api).
 -author('Maxim Sokhatsky').
 -include_lib("nitro/include/nitro.hrl").
+-include_lib("nitro/include/event.hrl").
 -compile(export_all).
 
 -define(B(E), nitro:to_binary(E)).

src/actions/action_bind.erl

@@ -1,6 +1,7 @@
 -module(action_bind).
 -author('Maxim Sokhatsky').
 -include_lib("nitro/include/nitro.hrl").
+-include_lib("nitro/include/event.hrl").
 -compile(export_all).
 
 -define(B(E), nitro:to_binary(E)).

src/actions/action_confirm.erl

@@ -1,6 +1,7 @@
 -module(action_confirm).
 -author('Rusty Klophaus').
 -include_lib("nitro/include/nitro.hrl").
+-include_lib("nitro/include/event.hrl").
 -compile(export_all).
 
 render_action(#confirm{target=Control,text=Text,postback=Postback,delegate=Delegate}) -> 

src/actions/action_event.erl

@@ -2,6 +2,7 @@
 -author('Maxim Sokhatsky').
 -author('Andrey Martemyanov').
 -include_lib("nitro/include/nitro.hrl").
+-include_lib("nitro/include/event.hrl").
 -compile(export_all).
 -define(B(E), nitro:to_binary(E)).
 

src/actions/action_jq.erl

@@ -2,6 +2,7 @@
 -author('Rusty Klophaus').
 -author('Andrey Martemyanov').
 -include_lib("nitro/include/nitro.hrl").
+-include_lib("nitro/include/event.hrl").
 -compile(export_all).
 
 -define(B(E), nitro:to_binary(E)).

src/actions/action_manage.erl

@@ -1,20 +0,0 @@
--module(action_manage).
--author('Andrey Martemyanov').
--include_lib("nitro/include/nitro.hrl").
--compile(export_all).
-
--define(B(E), nitro:to_binary(E)).
--define(R(E), nitro:render(E)).
--define(T(T), wf_event:target(T)).
-
-render_action(#replace{target=T,elements=E}) -> ?R(#jq{target=T,property=outerHTML,right=E});
-render_action(#insert{target=T,elements=E,position=P}) ->
-    {Rendered,Actions}=render_element(E),
-    [?T(T),".insertAdjacentHTML('",?B(P),"','",Rendered,"');",?R(Actions)];
-render_action(#multi{actions=A}) -> ["window.requestAnimationFrame(function(timestamp){",?R(A),"});"].
-
-render_element(E) ->
-    Pid = self(),
-    Ref = make_ref(),
-    spawn(fun() -> Pid ! {?R(E),Ref,nitro:actions()} end),
-    receive {Rendered, Ref, Actions} -> {Rendered,Actions} end.

src/actions/action_transfer.erl

@@ -1,12 +0,0 @@
--module(action_transfer).
--author('Andrey Martemyanov').
--include_lib("nitro/include/nitro.hrl").
--compile(export_all).
-
-render_action(Record) ->
-    case Record#transfer.state of
-        undefined -> ok;
-        List when is_list(List) -> [ erlang:put(K,V) || {K,V} <- List ];
-        Single -> erlang:put(state,Single) end,
-    Events = case Record#transfer.events of E when is_list(E) -> E; E -> [E] end,
-    [ self() ! M || M <- Events ], ok.

src/actions/action_ui.erl

@@ -1,6 +1,7 @@
 -module(action_ui).
 -author('Andrey Martemyanov').
 -include_lib("nitro/include/nitro.hrl").
+-include_lib("nitro/include/event.hrl").
 -compile(export_all).
 
 -define(T(T), wf_event:target(T)).

src/actions/action_wire.erl

@@ -1,6 +1,7 @@
 -module(action_wire).
 -author('Maxim Sokhatsky').
 -include_lib("nitro/include/nitro.hrl").
+-include_lib("nitro/include/event.hrl").
 -compile(export_all).
 
 render_action(#wire{actions=Actions}) -> nitro:render(Actions);

src/elements/element_button.erl

@@ -1,6 +1,7 @@
 -module(element_button).
 -author('Andrew Zadorozhny').
 -include_lib("nitro/include/nitro.hrl").
+-include_lib("nitro/include/event.hrl").
 -compile(export_all).
 
 render_element(Record) ->

src/elements/element_calendar.erl

@@ -1,6 +1,7 @@
 -module(element_calendar).
 -author('G-Grand').
 -include_lib("nitro/include/nitro.hrl").
+-include_lib("nitro/include/event.hrl").
 -export([render_element/1]).
 
 render_element(Record) ->

src/elements/element_checkbox.erl

@@ -1,6 +1,7 @@
 -module(element_checkbox).
 -author('Rusty Klophaus, Vladimir Galunshchikov').
 -include_lib("nitro/include/nitro.hrl").
+-include_lib("nitro/include/event.hrl").
 -compile(export_all).
 
 render_element(Record) -> 

src/elements/element_color.erl

@@ -1,6 +1,7 @@
 -module(element_color).
 -author('Vladimir Galunshchikov').
 -include_lib("nitro/include/nitro.hrl").
+-include_lib("nitro/include/event.hrl").
 -compile(export_all).
 
 render_element(Record) ->

src/elements/element_date.erl

@@ -1,6 +1,7 @@
 -module(element_date).
 -author('Vladimir Galunshchikov').
 -include_lib("nitro/include/nitro.hrl").
+-include_lib("nitro/include/event.hrl").
 -compile(export_all).
 
 render_element(Record) ->

src/elements/element_datetime.erl

@@ -1,6 +1,7 @@
 -module(element_datetime).
 -author('Vladimir Galunshchikov').
 -include_lib("nitro/include/nitro.hrl").
+-include_lib("nitro/include/event.hrl").
 -compile(export_all).
 
 render_element(Record) ->

src/elements/element_datetime_local.erl

@@ -1,6 +1,7 @@
 -module(element_datetime_local).
 -author('Vladimir Galunshchikov').
 -include_lib("nitro/include/nitro.hrl").
+-include_lib("nitro/include/event.hrl").
 -compile(export_all).
 
 render_element(Record) ->

src/elements/element_dropdown.erl

@@ -1,5 +1,6 @@
 -module(element_dropdown).
 -include_lib("nitro/include/nitro.hrl").
+-include_lib("nitro/include/event.hrl").
 -compile(export_all).
 
 render_element(Record = #dropdown{}) -> 

src/elements/element_email.erl

@@ -1,6 +1,7 @@
 -module(element_email).
 -author('Vladimir Galunshchikov').
 -include_lib("nitro/include/nitro.hrl").
+-include_lib("nitro/include/event.hrl").
 -compile(export_all).
 
 render_element(Record) ->

src/elements/element_file.erl

@@ -1,6 +1,7 @@
 -module(element_file).
 -author('Vladimir Galunshchikov').
 -include_lib("nitro/include/nitro.hrl").
+-include_lib("nitro/include/event.hrl").
 -compile(export_all).
 
 render_element(Record) ->

src/elements/element_form.erl

@@ -1,6 +1,7 @@
 -module(element_form).
 -author('Vladimir Galunshchikov').
 -include_lib("nitro/include/nitro.hrl").
+-include_lib("nitro/include/event.hrl").
 -compile(export_all).
 
 render_element(Record) ->

src/elements/element_input.erl

@@ -1,5 +1,6 @@
 -module(element_input).
 -include_lib("nitro/include/nitro.hrl").
+-include_lib("nitro/include/event.hrl").
 -compile(export_all).
 
 render_element(Record) ->

src/elements/element_input_button.erl

@@ -1,6 +1,7 @@
 -module(element_input_button).
 -author('Vladimir Galunshchikov').
 -include_lib("nitro/include/nitro.hrl").
+-include_lib("nitro/include/event.hrl").
 -compile(export_all).
 
 render_element(Record) ->

src/elements/element_input_image.erl

@@ -1,6 +1,7 @@
 -module(element_input_image).
 -author('Vladimir Galunshchikov').
 -include_lib("nitro/include/nitro.hrl").
+-include_lib("nitro/include/event.hrl").
 -compile(export_all).
 
 render_element(Record) ->

src/elements/element_input_time.erl

@@ -1,6 +1,7 @@
 -module(element_input_time).
 -author('Vladimir Galunshchikov').
 -include_lib("nitro/include/nitro.hrl").
+-include_lib("nitro/include/event.hrl").
 -compile(export_all).
 
 render_element(Record) ->

src/elements/element_keygen.erl

@@ -1,6 +1,7 @@
 -module(element_keygen).
 -author('Vladimir Galunshchikov').
 -include_lib("nitro/include/nitro.hrl").
+-include_lib("nitro/include/event.hrl").
 -compile(export_all).
 
 render_element(Record) ->

src/elements/element_link.erl

@@ -1,6 +1,7 @@
 -module(element_link).
 -author('Rusty Klophaus').
 -include_lib("nitro/include/nitro.hrl").
+-include_lib("nitro/include/event.hrl").
 -compile(export_all).
 
 render_element(Record) -> 

src/elements/element_month.erl

@@ -1,6 +1,7 @@
 -module(element_month).
 -author('Vladimir Galunshchikov').
 -include_lib("nitro/include/nitro.hrl").
+-include_lib("nitro/include/event.hrl").
 -compile(export_all).
 
 render_element(Record) ->

src/elements/element_number.erl

@@ -1,6 +1,7 @@
 -module(element_number).
 -author('Vladimir Galunshchikov').
 -include_lib("nitro/include/nitro.hrl").
+-include_lib("nitro/include/event.hrl").
 -compile(export_all).
 
 render_element(Record) ->

src/elements/element_password.erl

@@ -1,6 +1,7 @@
 -module(element_password).
 -author('Vladimir Galunshchikov').
 -include_lib("nitro/include/nitro.hrl").
+-include_lib("nitro/include/event.hrl").
 -compile(export_all).
 
 render_element(Record) ->

src/elements/element_radio.erl

@@ -1,6 +1,7 @@
 -module(element_radio).
 -author('Rusty Klophaus').
 -include_lib("nitro/include/nitro.hrl").
+-include_lib("nitro/include/event.hrl").
 -compile(export_all).
 
 render_element(Record) ->

src/elements/element_range.erl

@@ -1,6 +1,7 @@
 -module(element_range).
 -author('Vladimir Galunshchikov').
 -include_lib("nitro/include/nitro.hrl").
+-include_lib("nitro/include/event.hrl").
 -compile(export_all).
 
 render_element(Record) ->

src/elements/element_reset.erl

@@ -1,6 +1,7 @@
 -module(element_reset).
 -author('Vladimir Galunshchikov').
 -include_lib("nitro/include/nitro.hrl").
+-include_lib("nitro/include/event.hrl").
 -compile(export_all).
 
 render_element(Record) ->

src/elements/element_search.erl

@@ -1,6 +1,7 @@
 -module(element_search).
 -author('Vladimir Galunshchikov').
 -include_lib("nitro/include/nitro.hrl").
+-include_lib("nitro/include/event.hrl").
 -compile(export_all).
 
 render_element(Record) ->

src/elements/element_select.erl

@@ -1,5 +1,6 @@
 -module(element_select).
 -include_lib("nitro/include/nitro.hrl").
+-include_lib("nitro/include/event.hrl").
 -compile(export_all).
 
 render_element(Record = #select{}) ->

src/elements/element_submit.erl

@@ -1,8 +1,10 @@
 -module (element_submit).
 -author('Andrew Zadorozhny').
 -include_lib("nitro/include/nitro.hrl").
+-include_lib("nitro/include/event.hrl").
 -compile(export_all).
 
+
 render_element(Record) ->
     ID = case Record#submit.id of [] -> nitro:temp_id(); I->I end,
     case Record#submit.postback of

src/elements/element_tel.erl

@@ -1,6 +1,7 @@
 -module(element_tel).
 -author('Vladimir Galunshchikov').
 -include_lib("nitro/include/nitro.hrl").
+-include_lib("nitro/include/event.hrl").
 -compile(export_all).
 
 render_element(Record) ->

src/elements/element_tr.erl

@@ -1,5 +1,6 @@
 -module(element_tr).
 -include("nitro.hrl").
+-include_lib("nitro/include/event.hrl").
 -compile(export_all).
 
 render_element(Record = #tr{postback= Postback}) ->

src/elements/element_upload.erl

@@ -1,6 +1,7 @@
 -module(element_upload).
 -compile(export_all).
 -include_lib("nitro/include/nitro.hrl").
+-include_lib("nitro/include/event.hrl").
 
 render_element(#upload{id=Id}) ->
     Uid = case Id of [] -> nitro:temp_id(); I -> I end,

src/elements/element_url.erl

@@ -1,6 +1,7 @@
 -module(element_url).
 -author('Vladimir Galunshchikov').
 -include_lib("nitro/include/nitro.hrl").
+-include_lib("nitro/include/event.hrl").
 -compile(export_all).
 
 render_element(Record) ->

src/elements/element_week.erl

@@ -1,6 +1,7 @@
 -module(element_week).
 -author('Vladimir Galunshchikov').
 -include_lib("nitro/include/nitro.hrl").
+-include_lib("nitro/include/event.hrl").
 -compile(export_all).
 
 render_element(Record) ->

src/nitro.erl

@@ -1,6 +1,7 @@
 -module(nitro).
 -include_lib("nitro/include/cx.hrl").
 -include_lib("nitro/include/nitro.hrl").
+-include_lib("nitro/include/event.hrl").
 -compile(export_all).
 -behaviour(application).
 -export([start/2, stop/1, init/1]).

src/render/wf_render_actions.erl

@@ -1,6 +1,7 @@
 -module(wf_render_actions).
 -author('Andrew Zadorozhny').
--include_lib ("nitro/include/nitro.hrl").
+-include_lib("nitro/include/nitro.hrl").
+-include_lib("nitro/include/event.hrl").
 -compile(export_all).
 
 render_action(Action) ->