Browse Source

fix warnings erl 19

221V 1 year ago
parent
commit
f2fd46252e
3 changed files with 5 additions and 5 deletions
  1. 1 1
      src/elements/element_upload.erl
  2. 1 1
      src/nitro.erl
  3. 3 3
      src/render/wf_render_elements.erl

+ 1 - 1
src/elements/element_upload.erl

@@ -2,7 +2,7 @@
 -compile(export_all).
 -compile(export_all).
 -include_lib("nitro/include/nitro.hrl").
 -include_lib("nitro/include/nitro.hrl").
 
 
-render_element(#upload{id=Id} = U) ->
+render_element(#upload{id=Id}) ->
     Uid = case Id of undefined -> wf:temp_id(); I -> I end,
     Uid = case Id of undefined -> wf:temp_id(); I -> I end,
     wf:wire("ftp_file=undefined;"),
     wf:wire("ftp_file=undefined;"),
     bind(ftp_open,  click,  wf:f("qi('~s').click(); event.preventDefault();", [wf:to_list(Uid)])),
     bind(ftp_open,  click,  wf:f("qi('~s').click(); event.preventDefault();", [wf:to_list(Uid)])),

+ 1 - 1
src/nitro.erl

@@ -65,7 +65,7 @@ depickle(SerializedData, TTLSeconds) -> ?PICKLER:depickle(SerializedData, TTLSec
 render(X) -> wf_render:render(X).
 render(X) -> wf_render:render(X).
 wire(Actions) -> action_wire:wire(Actions).
 wire(Actions) -> action_wire:wire(Actions).
 
 
-unique_integer() -> try erlang:unique_integer() catch _:_ -> {MS,S,US} = erlang:now(), (MS*1000000+S)*1000000+US end.
+unique_integer() -> try erlang:unique_integer() catch _:_ -> {MS,S,US} = erlang:timestamp(), (MS*1000000+S)*1000000+US end.
 temp_id() -> "auto" ++ integer_to_list(unique_integer() rem 1000000).
 temp_id() -> "auto" ++ integer_to_list(unique_integer() rem 1000000).
 
 
 html_encode(L,Fun) when is_function(Fun) -> Fun(L);
 html_encode(L,Fun) when is_function(Fun) -> Fun(L);

+ 3 - 3
src/render/wf_render_elements.erl

@@ -17,8 +17,8 @@ render_element(Element) when is_tuple(Element) ->
          nitro:wire(nitro:f("{var name='~s'; qi(name)"
          nitro:wire(nitro:f("{var name='~s'; qi(name)"
            ".addEventListener('validation',"
            ".addEventListener('validation',"
               "function(e) { if (!(~s)) e.preventDefault(); });"
               "function(e) { if (!(~s)) e.preventDefault(); });"
-              "qi(name).validation = true;}",[Id,Code]));
-         _ -> skip end,
+              "qi(name).validation = true;}",[Id,Code]))
+    end,
     case element(#element.module,Element) of
     case element(#element.module,Element) of
         undefined ->
         undefined ->
 	    default_render(Tag, Element);
 	    default_render(Tag, Element);
@@ -46,4 +46,4 @@ default_render(Tag, Record) ->
             {<<"tabindex">>,        element(#element.tabindex, Record)},
             {<<"tabindex">>,        element(#element.tabindex, Record)},
             {<<"role">>,            element(#element.role, Record)}],
             {<<"role">>,            element(#element.role, Record)}],
         element(#element.data_fields, Record),
         element(#element.data_fields, Record),
-        element(#element.aria_states, Record)])).
+        element(#element.aria_states, Record)])).