Namdak Tonpa 9 years ago
parent
commit
d20adbd4d2
5 changed files with 22 additions and 2 deletions
  1. 5 0
      include/nitro.hrl
  2. 9 0
      src/nitro.app.src
  3. 6 0
      src/nitro.erl
  4. 1 1
      src/render/wf_event.erl
  5. 1 1
      src/render/wf_render.erl

+ 5 - 0
include/nitro.hrl

@@ -1,6 +1,9 @@
 -ifndef(N2O_HRL).
 -ifndef(N2O_HRL).
 -define(N2O_HRL, true).
 -define(N2O_HRL, true).
 
 
+-define(CTX, (get(context))).
+-define(REQ, (get(context))#cx.req).
+
 -record(handler, {name, module, config, state}).
 -record(handler, {name, module, config, state}).
 -record(cx,      {handlers, actions, req, module, lang, path, session, params, form, state=[]}).
 -record(cx,      {handlers, actions, req, module, lang, path, session, params, form, state=[]}).
 -record(ev,      {module, msg, trigger, name :: api_event | control_event | event | atom() }).
 -record(ev,      {module, msg, trigger, name :: api_event | control_event | event | atom() }).
@@ -188,3 +191,5 @@
 -record(confirm, {?ACTION_BASE(action_confirm), text, postback, delegate}).
 -record(confirm, {?ACTION_BASE(action_confirm), text, postback, delegate}).
 -record(jq,      {?ACTION_BASE(action_jq), property, method, args=[], right, format="~s"}).
 -record(jq,      {?ACTION_BASE(action_jq), property, method, args=[], right, format="~s"}).
 -record(transfer,{?ACTION_BASE(action_transfer), state, events=[] }).
 -record(transfer,{?ACTION_BASE(action_transfer), state, events=[] }).
+
+-endif.

+ 9 - 0
src/nitro.app.src

@@ -0,0 +1,9 @@
+{application, nitro, [
+    {description,  "NITRO HTML5 DSL"},
+    {vsn,          "0.8"},
+    {applications, [kernel, stdlib]},
+    {modules, []},
+    {registered,   []},
+    {mod, { nitro, []}},
+    {env, []}
+]}.

+ 6 - 0
src/nitro.erl

@@ -1,5 +1,11 @@
 -module(nitro).
 -module(nitro).
 -compile(export_all).
 -compile(export_all).
+-behaviour(application).
+-export([start/2, stop/1, init/1]).
+
+start(_StartType, _StartArgs) -> supervisor:start_link({local, ?MODULE}, ?MODULE, []).
+stop(_State) -> ok.
+init([]) -> {ok, {{one_for_one, 5, 10}, []}}.
 
 
 f(S) -> f(S, []).
 f(S) -> f(S, []).
 f(S, Args) -> lists:flatten(io_lib:format(S, Args)).
 f(S, Args) -> lists:flatten(io_lib:format(S, Args)).

+ 1 - 1
src/render/wf_event.erl

@@ -1,6 +1,6 @@
 -module(wf_event).
 -module(wf_event).
 -author('Maxim Sokhatsky').
 -author('Maxim Sokhatsky').
--include_lib ("n2o/include/wf.hrl").
+-include_lib ("nitro/include/nitro.hrl").
 -compile(export_all).
 -compile(export_all).
 
 
 new(bin,Data) -> <<"ws.send(enc(tuple(atom('bin'),bin('",(wf:pickle(Data))/binary,"'))));">>.
 new(bin,Data) -> <<"ws.send(enc(tuple(atom('bin'),bin('",(wf:pickle(Data))/binary,"'))));">>.

+ 1 - 1
src/render/wf_render.erl

@@ -1,5 +1,5 @@
 -module(wf_render).
 -module(wf_render).
--include_lib("n2o/include/wf.hrl").
+-include_lib("nitro/include/nitro.hrl").
 -compile(export_all).
 -compile(export_all).
 
 
 render_item(E) when element(2,E) == element -> wf_render_elements:render_element(E);
 render_item(E) when element(2,E) == element -> wf_render_elements:render_element(E);