Browse Source

unwrap script/1,2, state/0,2

221V 1 year ago
parent
commit
02bb5be5c3
3 changed files with 10 additions and 15 deletions
  1. 6 0
      CHANGELOG.md
  2. 1 1
      src/elements/group/element_dtl.erl
  3. 3 14
      src/nitro.erl

+ 6 - 0
CHANGELOG.md

@@ -9,9 +9,15 @@
   nitro:hte/1 -> nitro:html_encode/1  
   nitro:actions/0 -> erlang:get(actions)  
   nitro:actions/1 -> erlang:put(actions, Actions)  
+  nitro:script/0 -> erlang:get(script)  
+  nitro:script/1 -> erlang:put(script, Script)  
+  nitro:state/1 -> erlang:get(Key)  
+  nitro:state/2 -> erlang:put(Key, Value)  
   nitro:config/3 -> application:get_env/3  
 ```
 * mv nitro_conv > nitro module  
+* mv redirect to n2o (n4u)  
+* mv work with cookies to n2o (n4u)  
 
 ##### 6.6.1-erl19
 * update to 6.6.1 tag by [@5HT Maksym Sokhatskyi/Namdak Tönpa](https://github.com/5HT)  

+ 1 - 1
src/elements/group/element_dtl.erl

@@ -19,7 +19,7 @@ render_element(Record = #dtl{}) ->
   %  ++ "/" ++ nitro:to_list(Record#dtl.file) ++ "." ++ nitro:to_list(Record#dtl.ext),
   {ok, R} = render(M, Record#dtl.js_escape, [{K, nitro:render(V)} || {K, V} <- Record#dtl.bindings] ++
     case Record#dtl.bind_script of
-      true -> [{script, nitro:script()}];
+      true -> [{script, erlang:get(script) }];
       _ -> []
     end),
   R.

+ 3 - 14
src/nitro.erl

@@ -6,10 +6,8 @@
 -include_lib("nitro/include/event.hrl").
 
 
--export([atom/1, q/1, q/2, qc/1, qc/2,
+-export([atom/1, q/1, q/2, qc/1, qc/2, f/1, f/2, coalesce/1,
   pickle/1, depickle/1, unique_integer/0, temp_id/0,
-  script/0, script/1, state/1, state/2,
-  f/1, f/2, coalesce/1,
   to_list/1, to_atom/1, to_binary/1, to_integer/1,
   join/2, replace/3, indexof/2, indexof/3, append/3, os_env/1, os_env/2,
   prolongate/0, authenticate/2,
@@ -18,7 +16,8 @@
   update/2, insert_top/2, insert_top/3, insert_bottom/2, insert_bottom/3,
   insert_before/2, insert_after/2, insert_adjacent/3, insert_adjacent/4,
   clear/1, remove/1, setAttr/3, style/2, style/3, display/2, show/1, hide/1,
-  compact/1, meg/1, num/1 ]).
+  compact/1, meg/1, num/1
+]).
 
 
 atom(List) when erlang:is_list(List) ->
@@ -332,10 +331,6 @@ url_decode_h([Lo, Hi, ?PERCENT | Rest], Acc) when ?IS_HEX(Lo), ?IS_HEX(Hi) ->
 url_decode_h([C | Rest], Acc) -> url_decode_h(Rest, [C | Acc]).
 
 
-script() -> get(script).
-script(Script) -> put(script, Script).
-
-
 %% Update DOM nitro:update
 
 update(Target, Elements) ->
@@ -404,12 +399,6 @@ remove(Target) ->
              "x && x.parentNode.removeChild(x);").
 
 
-%% Wire JavaScript nitro:wire
-
-state(Key) -> erlang:get(Key).
-state(Key,Value) -> erlang:put(Key, Value).
-
-
 setAttr(Element, Attr, Value) ->
   nitro:wire("{ var x = qi('" ++ ?MODULE:to_list(Element) ++ "');"
              "if(x) x.setAttribute('" ++ ?MODULE:to_list(Attr) ++ "', '" ++ ?MODULE:to_list(Value) ++ "'); }").