Namdak Tonpa 5 years ago
parent
commit
06ab7075ce
4 changed files with 9 additions and 8 deletions
  1. 1 1
      mix.exs
  2. 1 0
      priv/js/calendar.js
  3. 6 6
      src/elements/input/element_calendar.erl
  4. 1 1
      src/nitro.app.src

+ 1 - 1
mix.exs

@@ -4,7 +4,7 @@ defmodule NITRO.Mixfile do
   def project do
   def project do
     [
     [
       app: :nitro,
       app: :nitro,
-      version: "4.11.3",
+      version: "4.11.4",
       description: "NITRO Nitrogen Web Framework",
       description: "NITRO Nitrogen Web Framework",
       package: package(),
       package: package(),
       deps: deps()
       deps: deps()

+ 1 - 0
priv/js/calendar.js

@@ -482,6 +482,7 @@ function parseDateFromInput(value) {
             }
             }
             e = e || window.event;
             e = e || window.event;
             var target = e.target || e.srcElement;
             var target = e.target || e.srcElement;
+            console.log(target);
             if (!target) {
             if (!target) {
                 return;
                 return;
             }
             }

+ 6 - 6
src/elements/input/element_calendar.erl

@@ -45,7 +45,7 @@ render_element(Record) ->
       {<<"required">>,if Record#calendar.required == true -> "required"; true -> [] end},
       {<<"required">>,if Record#calendar.required == true -> "required"; true -> [] end},
       {<<"step">>,Record#calendar.step},
       {<<"step">>,Record#calendar.step},
       {<<"type">>, <<"calendar">>},
       {<<"type">>, <<"calendar">>},
-      {<<"value">>, case Record#calendar.value of {Yv,Mv,Dv} -> io_lib:format("~p-~p-~p",[Yv,Mv,Dv]); [] -> []; _ -> "2019, 10, 7" end},
+      {<<"value">>, case Record#calendar.value of {Yv,Mv,Dv} -> io_lib:format("~p-~p-~p",[Yv,Mv,Dv]); [] -> []; _ -> [] end},
       {<<"pattern">>,Record#calendar.pattern},
       {<<"pattern">>,Record#calendar.pattern},
       {<<"placeholder">>,Record#calendar.placeholder},
       {<<"placeholder">>,Record#calendar.placeholder},
       {<<"onkeypress">>, Record#calendar.onkeypress} | Record#calendar.data_fields
       {<<"onkeypress">>, Record#calendar.onkeypress} | Record#calendar.data_fields
@@ -55,14 +55,14 @@ 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]),
     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,
- %   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,
-    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,
+    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, 11, 26)" end,
+    MinDate =     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 =     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(2189, 4, 1)" end,
     OnSelect =    "null",
     OnSelect =    "null",
     DisDay =      "null",
     DisDay =      "null",
     Position =    "bottom left",
     Position =    "bottom left",

+ 1 - 1
src/nitro.app.src

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