Browse Source

eliminate wf api

Namdak Tonpa 6 years ago
parent
commit
d67e0efab1
2 changed files with 4 additions and 4 deletions
  1. 1 1
      src/actions/action_manage.erl
  2. 3 3
      src/nitro_conv.erl

+ 1 - 1
src/actions/action_manage.erl

@@ -16,5 +16,5 @@ render_action(#multi{actions=A}) -> ["window.requestAnimationFrame(function(time
 render_element(E) ->
 render_element(E) ->
     Pid = self(),
     Pid = self(),
     Ref = make_ref(),
     Ref = make_ref(),
-    spawn(fun() -> Pid ! {?R(E),Ref,wf:actions()} end),
+    spawn(fun() -> Pid ! {?R(E),Ref,nitro:actions()} end),
     receive {Rendered, Ref, Actions} -> {Rendered,Actions} end.
     receive {Rendered, Ref, Actions} -> {Rendered,Actions} end.

+ 3 - 3
src/nitro_conv.erl

@@ -46,12 +46,12 @@ to_integer(F) when is_float(F) -> round(F).
 % HTML encode/decode
 % HTML encode/decode
 
 
 html_encode(L,Fun) when is_function(Fun) -> Fun(L);
 html_encode(L,Fun) when is_function(Fun) -> Fun(L);
-html_encode(L,EncType) when is_atom(L) -> html_encode(wf:to_list(L),EncType);
+html_encode(L,EncType) when is_atom(L) -> html_encode(nitro:to_list(L),EncType);
 html_encode(L,EncType) when is_integer(L) -> html_encode(integer_to_list(L),EncType);
 html_encode(L,EncType) when is_integer(L) -> html_encode(integer_to_list(L),EncType);
 html_encode(L,EncType) when is_float(L) -> html_encode(float_to_list(L,[{decimals,9},compact]),EncType);
 html_encode(L,EncType) when is_float(L) -> html_encode(float_to_list(L,[{decimals,9},compact]),EncType);
 html_encode(L, false) -> L;
 html_encode(L, false) -> L;
 html_encode(L, true) -> L;
 html_encode(L, true) -> L;
-html_encode(L, whites) -> html_encode_whites(wf:to_list(lists:flatten([L]))).
+html_encode(L, whites) -> html_encode_whites(nitro:to_list(lists:flatten([L]))).
 html_encode(<<>>) -> [];
 html_encode(<<>>) -> [];
 html_encode([]) -> [];
 html_encode([]) -> [];
 html_encode([$\n|T]) -> "<br>" ++ html_encode(T);
 html_encode([$\n|T]) -> "<br>" ++ html_encode(T);
@@ -65,7 +65,7 @@ html_encode([H|T]) ->
 		BigNum when is_integer(BigNum) andalso BigNum > 255 ->
 		BigNum when is_integer(BigNum) andalso BigNum > 255 ->
 			%% Any integers above 255 are converted to their HTML encode equivilant,
 			%% Any integers above 255 are converted to their HTML encode equivilant,
 			%% Example: 7534 gets turned into &#7534;
 			%% Example: 7534 gets turned into &#7534;
-			[$&,$# | wf:to_list(BigNum)] ++ ";" ++ html_encode(T);
+			[$&,$# | nitro:to_list(BigNum)] ++ ";" ++ html_encode(T);
 		Tup when is_tuple(Tup) -> 
 		Tup when is_tuple(Tup) -> 
 			throw({html_encode,encountered_tuple,Tup});
 			throw({html_encode,encountered_tuple,Tup});
 		_ -> [H|html_encode(T)]
 		_ -> [H|html_encode(T)]