Browse Source

fix format date change

Che 5 years ago
parent
commit
7e6eb3e9e9
4 changed files with 6 additions and 6 deletions
  1. 1 1
      include/calendar.hrl
  2. 2 2
      man/nx_calendar.htm
  3. 2 2
      priv/js/calendar.js
  4. 1 1
      src/elements/combo/element_calendar.erl

+ 1 - 1
include/calendar.hrl

@@ -5,7 +5,7 @@
 
 -record(calendar, {?ELEMENT_BASE(element_calendar),
   autocomplete=true, autofocus=false, disabled=false, form=[], list=[], maxDate={2019,2,2},
-    minDate, format="YYYY.MM.DD", pattern=[], name=[], step=[], readonly=[], required=[],
+    minDate, format="DD.MM.YYYY", pattern=[], name=[], step=[], readonly=[], required=[],
     value={2020,2,2}, placeholder=[], onSelect=[], disableDayFn=[], position=[],
     reposition=[], yearRange=100}).
 

+ 2 - 2
man/nx_calendar.htm

@@ -43,7 +43,7 @@
                      list=[],
                      maxDate={2019,2,2},
                      minDate,
-                     format="YYYY.MM.DD",
+                     format="DD.MM.YYYY",
                      pattern=[],
                      name=[],
                      step=[],
@@ -73,7 +73,7 @@
    setDefaultDate: false,
    minDate: null,
    maxDate: new Date(2020,10,10),
-   format: 'YYYY.MM.DD',
+   format: 'DD.MM.YYYY',
    onSelect: null,
    disableDayFn: null,
    position: 'bottom left',

+ 2 - 2
priv/js/calendar.js

@@ -52,7 +52,7 @@ function getDateParamBySign(date,sign) {
 
 function formatter(date, format) {
     date = date || new Date();
-    format = format || "YYYYMM.DD";
+    format = format || "DD.MM.YYYY";
     var signs = format.match(/(Y{2,4})|(M{2})|(D{2})/g);
     var params = [];
     var reStr = '';
@@ -266,7 +266,7 @@ function parseDateFromInput(value) {
         reposition: true,
 
         // the default output format for `.toString()` and `field` value
-        format: 'YYYY.MM.DD',
+        format: 'DD.MM.YYYY',
 
         // the initial date to view when first opened
         defaultDate: null,

+ 1 - 1
src/elements/combo/element_calendar.erl

@@ -56,7 +56,7 @@ init(Id,#calendar{minDate=Min,maxDate=Max,lang=Lang,format=Form,
         position=Pos,reposition=Repos,yearRange=YearRange} = Calendar) ->
     ID = nitro:to_list(Id),
     I18n =        "clLangs.ua",
-    Format =      "YYYY.MM.DD",
+    Format =      "DD.MM.YYYY",
     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)]);
         _ -> "''" end,