Merge pull request #60 from nosir/bug-fix

[bug-fix] Date input improvement
nosir · Jul 21, 2016 · 14d938c · 14d938c
2 parents 0a63989 + c295a52
commit 14d938c
Show file tree

Hide file tree

Showing 8 changed files with 73 additions and 37 deletions.
diff --git a/bower.json b/bower.json
@@ -8,7 +8,7 @@
     "form",
     "input"
   ],
-  "version": "0.4.9",
+  "version": "0.4.10",
   "author": {
     "name": "Max Huang",
     "email": "[email protected]",

diff --git a/dist/cleave-react.js b/dist/cleave-react.js
diff --git a/dist/cleave-react.min.js b/dist/cleave-react.min.js
diff --git a/dist/cleave.js b/dist/cleave.js
@@ -557,22 +557,30 @@ DateFormatter.prototype = {
         owner.blocks.forEach(function (length, index) {
             if (value.length > 0) {
                 var sub = value.slice(0, length),
+                    sub0 = sub.slice(0, 1),
                     rest = value.slice(length);
 
                 switch (owner.datePattern[index]) {
                 case 'd':
-                    if (parseInt(sub, 10) > 31) {
+                    if (sub === '00') {
+                        sub = '01';
+                    } else if (parseInt(sub0, 10) > 3) {
+                        sub = '0' + sub0;
+                    } else if (parseInt(sub, 10) > 31) {
                         sub = '31';
-                    } else if (parseInt(sub, 10) === 0) {
-                        //sub = '01';
                     }
+
                     break;
+
                 case 'm':
-                    if (parseInt(sub, 10) > 12) {
+                    if (sub === '00') {
+                        sub = '01';
+                    } else if (parseInt(sub0, 10) > 1) {
+                        sub = '0' + sub0;
+                    } else if (parseInt(sub, 10) > 12) {
                         sub = '12';
-                    } else if (parseInt(sub, 10) === 0) {
-                        //sub = '01';
                     }
+
                     break;
                 }
 

diff --git a/dist/cleave.min.js b/dist/cleave.min.js
diff --git a/package.json b/package.json
@@ -10,7 +10,7 @@
     "form",
     "input"
   ],
-  "version": "0.4.9",
+  "version": "0.4.10",
   "author": {
     "name": "Max Huang",
     "url": "http://github.com/nosir",

diff --git a/src/shortcuts/DateFormatter.js b/src/shortcuts/DateFormatter.js
@@ -32,22 +32,30 @@ DateFormatter.prototype = {
         owner.blocks.forEach(function (length, index) {
             if (value.length > 0) {
                 var sub = value.slice(0, length),
+                    sub0 = sub.slice(0, 1),
                     rest = value.slice(length);
 
                 switch (owner.datePattern[index]) {
                 case 'd':
-                    if (parseInt(sub, 10) > 31) {
+                    if (sub === '00') {
+                        sub = '01';
+                    } else if (parseInt(sub0, 10) > 3) {
+                        sub = '0' + sub0;
+                    } else if (parseInt(sub, 10) > 31) {
                         sub = '31';
-                    } else if (parseInt(sub, 10) === 0) {
-                        //sub = '01';
                     }
+
                     break;
+
                 case 'm':
-                    if (parseInt(sub, 10) > 12) {
+                    if (sub === '00') {
+                        sub = '01';
+                    } else if (parseInt(sub0, 10) > 1) {
+                        sub = '0' + sub0;
+                    } else if (parseInt(sub, 10) > 12) {
                         sub = '12';
-                    } else if (parseInt(sub, 10) === 0) {
-                        //sub = '01';
                     }
+
                     break;
                 }
 

diff --git a/test/fixtures/date.json b/test/fixtures/date.json
@@ -16,23 +16,27 @@
       ],
       [
         "99071965",
-        "31071965"
+        "09071965"
       ],
       [
         "08991965",
-        "08121965"
+        "08091965"
       ],
       [
         "08121965000",
         "08121965"
       ],
       [
         "08001965",
-        "08001965"
+        "08011965"
       ],
       [
-        "00081965",
-        "00081965"
+        "08141965",
+        "08121965"
+      ],
+      [
+        "4",
+        "04"
       ]
     ]
   },
@@ -48,28 +52,32 @@
         "010765"
       ],
       [
-        "990765",
+        "330765",
         "310765"
       ],
       [
         "089965",
-        "081265"
+        "080965"
       ],
       [
         "08126599",
         "081265"
       ],
       [
-        "08/99*6599",
+        "08/18*6599",
         "081265"
       ],
       [
         "080065",
-        "080065"
+        "080165"
       ],
       [
         "000865",
-        "000865"
+        "010865"
+      ],
+      [
+        "900065",
+        "090165"
       ]
     ]
   },
@@ -84,7 +92,7 @@
         "0718"
       ],
       [
-        "9918",
+        "1918",
         "1218"
       ],
       [
@@ -93,7 +101,11 @@
       ],
       [
         "0008",
-        "0008"
+        "0108"
+      ],
+      [
+        "9018",
+        "0918"
       ]
     ]
   }