Namdak Tonpa 5 years ago
parent
commit
97b3ec477f
4 changed files with 6 additions and 6 deletions
  1. 2 2
      mix.exs
  2. 2 2
      src/elements/element_calendar.erl
  3. 1 1
      src/nitro.app.src
  4. 1 1
      src/nitro.erl

+ 2 - 2
mix.exs

@@ -4,7 +4,7 @@ defmodule NITRO.Mixfile do
   def project do
   def project do
     [
     [
       app: :nitro,
       app: :nitro,
-      version: "4.10.0",
+      version: "4.10.2",
       description: "NITRO Web Framework",
       description: "NITRO Web Framework",
       package: package(),
       package: package(),
       deps: deps()
       deps: deps()
@@ -26,6 +26,6 @@ defmodule NITRO.Mixfile do
   end
   end
 
 
   def deps do
   def deps do
-    [{:ex_doc, ">= 0.0.0", only: :dev}]
+    [{:ex_doc, "~> 0.11", only: :dev}]
   end
   end
 end
 end

+ 2 - 2
src/elements/element_calendar.erl

@@ -53,12 +53,12 @@ render_element(Record) ->
 init(Id,#calendar{minDate=Min,maxDate=Max,lang=Lang,format=Form,
 init(Id,#calendar{minDate=Min,maxDate=Max,lang=Lang,format=Form,
         value=Value,onSelect=SelectFn,disableDayFn=DisDayFn,
         value=Value,onSelect=SelectFn,disableDayFn=DisDayFn,
         position=Pos,reposition=Repos,yearRange=YearRange} = Calendar) ->
         position=Pos,reposition=Repos,yearRange=YearRange} = Calendar) ->
-    io:format("Calendar: ~p~n",[Calendar]),
+%    io:format("Calendar: ~p~n",[Calendar]),
     ID = nitro:to_list(Id),
     ID = nitro:to_list(Id),
     I18n =        "clLangs.ua",
     I18n =        "clLangs.ua",
     Format =      "YYYY-MM-DD",
     Format =      "YYYY-MM-DD",
     DefaultDate = case Value of {Yv,Mv,Dv} -> nitro:f("new Date(~s,~s,~s)",[nitro:to_list(Yv),nitro:to_list(Mv-1),nitro:to_list(Dv)]);  _ -> "new Date(2019, 10, 7)" end,
     DefaultDate = case Value of {Yv,Mv,Dv} -> nitro:f("new Date(~s,~s,~s)",[nitro:to_list(Yv),nitro:to_list(Mv-1),nitro:to_list(Dv)]);  _ -> "new Date(2019, 10, 7)" end,
-    io:format("Default Date: ~p~n",[DefaultDate]),
+%    io:format("Default Date: ~p~n",[DefaultDate]),
     MinDate =     "null", % case Min   of {Y,M,D}    -> nitro:f("new Date(~s,~s,~s)",[nitro:to_list(Y), nitro:to_list(M-1), nitro:to_list(D)]);   _ -> "new Date(2009, 3, 4)" end,
     MinDate =     "null", % case Min   of {Y,M,D}    -> nitro:f("new Date(~s,~s,~s)",[nitro:to_list(Y), nitro:to_list(M-1), nitro:to_list(D)]);   _ -> "new Date(2009, 3, 4)" end,
     MaxDate =     "new Date(2020,10,10)", %case Max   of {Y1,M1,D1} -> nitro:f("new Date(~s,~s,~s)",[nitro:to_list(Y1),nitro:to_list(M1-1),nitro:to_list(D1)]);  _ -> "new Date(2089, 4, 1)" end,
     MaxDate =     "new Date(2020,10,10)", %case Max   of {Y1,M1,D1} -> nitro:f("new Date(~s,~s,~s)",[nitro:to_list(Y1),nitro:to_list(M1-1),nitro:to_list(D1)]);  _ -> "new Date(2089, 4, 1)" end,
     OnSelect =    "null",
     OnSelect =    "null",

+ 1 - 1
src/nitro.app.src

@@ -1,6 +1,6 @@
 {application, nitro, [
 {application, nitro, [
     {description,  "NITRO Web Framework"},
     {description,  "NITRO Web Framework"},
-    {vsn,          "4.10.0"},
+    {vsn,          "4.10.2"},
     {applications, [kernel, stdlib]},
     {applications, [kernel, stdlib]},
     {modules, []},
     {modules, []},
     {registered,   []},
     {registered,   []},

+ 1 - 1
src/nitro.erl

@@ -196,7 +196,7 @@ compact(Tuple) when is_tuple(Tuple) ->
      Min = erlang:min(9,size(Tuple)),
      Min = erlang:min(9,size(Tuple)),
      Fields = lists:zip(lists:seq(1,Min),lists:sublist(tuple_to_list(Tuple),1,Min)),
      Fields = lists:zip(lists:seq(1,Min),lists:sublist(tuple_to_list(Tuple),1,Min)),
      "{" ++ string:join([ io_lib:format("~s",[compact(F)]) || {_,F}<- Fields ],",") ++ "}";
      "{" ++ string:join([ io_lib:format("~s",[compact(F)]) || {_,F}<- Fields ],",") ++ "}";
-compact(Tuple) -> nitro:to_list(Tuple).
+compact(Tuple) -> nitro:jse(nitro:to_list(Tuple)).
 
 
 meg(X) -> integer_to_list(X div 1000000) ++ "M".
 meg(X) -> integer_to_list(X div 1000000) ++ "M".
 rev(X) -> lists:reverse(X).
 rev(X) -> lists:reverse(X).