Browse Source

fix input type text default disabled; rm to_atom wrappers

221V 3 years ago
parent
commit
2c537c34c9
2 changed files with 4 additions and 4 deletions
  1. 2 2
      src/elements/input/element_textbox.erl
  2. 2 2
      src/nitro.erl

+ 2 - 2
src/elements/input/element_textbox.erl

@@ -36,8 +36,8 @@ render_element(Record) ->
     {<<"class">>, Record#textbox.class} | Record#textbox.data_fields
   ] ++
     case Record#textbox.disabled of
-      [] -> [];
-      _ -> [{<<"disabled">>, <<"disabled">>}]
+      true -> [{<<"disabled">>, <<"disabled">>}];
+      _ -> []
     end,
   
   wf_tags:emit_tag(<<"input">>, nitro:render(Record#textbox.body), List).

+ 2 - 2
src/nitro.erl

@@ -62,10 +62,10 @@ inner_to_list(L) when erlang:is_list(L) -> L;
 inner_to_list(F) when erlang:is_float(F) -> erlang:float_to_list(F, [{decimals, 9}, compact]).
 
 to_atom(A) when erlang:is_atom(A) -> A;
-to_atom(B) when erlang:is_binary(B) -> to_atom(erlang:binary_to_list(B));
+to_atom(B) when erlang:is_binary(B) -> erlang:binary_to_atom(B);
 to_atom(I) when erlang:is_integer(I) -> to_atom(erlang:integer_to_list(I));
 to_atom(F) when erlang:is_float(F) -> to_atom(erlang:float_to_list(F, [{decimals, 9}, compact]));
-to_atom(L) when erlang:is_list(L) -> erlang:list_to_atom(erlang:binary_to_list(erlang:list_to_binary(L))).
+to_atom(L) when erlang:is_list(L) -> erlang:list_to_atom(L).
 
 to_binary(A) when erlang:is_atom(A) -> erlang:atom_to_binary(A, latin1);
 to_binary(B) when erlang:is_binary(B) -> B;