[ISSUE-304] Fix date full year leading 0 issue (#312)

nosir · Mar 19, 2018 · 9956467 · 9956467
1 parent 9a5c004
commit 9956467
Show file tree

Hide file tree

Showing 12 changed files with 84 additions and 20 deletions.
diff --git a/bower.json b/bower.json
@@ -8,7 +8,7 @@
     "form",
     "input"
   ],
-  "version": "1.1.5",
+  "version": "1.1.6",
   "author": {
     "name": "Max Huang",
     "email": "[email protected]",

diff --git a/dist/cleave-angular.js b/dist/cleave-angular.js
@@ -666,7 +666,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	        var owner = this, datePattern = owner.datePattern, date = [],
 	            dayIndex = 0, monthIndex = 0, yearIndex = 0,
 	            dayStartIndex = 0, monthStartIndex = 0, yearStartIndex = 0,
-	            day, month, year;
+	            day, month, year, fullYearDone = false;
 
 	        // mm-dd || dd-mm
 	        if (value.length === 4 && datePattern[0].toLowerCase() !== 'y' && datePattern[1].toLowerCase() !== 'y') {
@@ -702,6 +702,8 @@ return /******/ (function(modules) { // webpackBootstrap
 	            month = parseInt(value.slice(monthStartIndex, monthStartIndex + 2), 10);
 	            year = parseInt(value.slice(yearStartIndex, yearStartIndex + 4), 10);
 
+	            fullYearDone = value.slice(yearStartIndex, yearStartIndex + 4).length === 4;
+
 	            date = this.getFixedDate(day, month, year);
 	        }
 
@@ -714,7 +716,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	            case 'm':
 	                return previous + owner.addLeadingZero(date[1]);
 	            default:
-	                return previous + '' + (date[2] || '');
+	                return previous + (fullYearDone ? owner.addLeadingZeroForYear(date[2]) : '');
 	            }
 	        }, '');
 	    },
@@ -737,6 +739,10 @@ return /******/ (function(modules) { // webpackBootstrap
 
 	    addLeadingZero: function (number) {
 	        return (number < 10 ? '0' : '') + number;
+	    },
+
+	    addLeadingZeroForYear: function (number) {
+	        return (number < 10 ? '000' : (number < 100 ? '00' : (number < 1000 ? '0' : ''))) + number;
 	    }
 	};
 

diff --git a/dist/cleave-angular.min.js b/dist/cleave-angular.min.js
diff --git a/dist/cleave-react-node.js b/dist/cleave-react-node.js
@@ -1922,7 +1922,8 @@ return /******/ (function(modules) { // webpackBootstrap
 	            yearStartIndex = 0,
 	            day,
 	            month,
-	            year;
+	            year,
+	            fullYearDone = false;
 
 	        // mm-dd || dd-mm
 	        if (value.length === 4 && datePattern[0].toLowerCase() !== 'y' && datePattern[1].toLowerCase() !== 'y') {
@@ -1958,6 +1959,8 @@ return /******/ (function(modules) { // webpackBootstrap
 	            month = parseInt(value.slice(monthStartIndex, monthStartIndex + 2), 10);
 	            year = parseInt(value.slice(yearStartIndex, yearStartIndex + 4), 10);
 
+	            fullYearDone = value.slice(yearStartIndex, yearStartIndex + 4).length === 4;
+
 	            date = this.getFixedDate(day, month, year);
 	        }
 
@@ -1970,7 +1973,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	                case 'm':
 	                    return previous + owner.addLeadingZero(date[1]);
 	                default:
-	                    return previous + '' + (date[2] || '');
+	                    return previous + (fullYearDone ? owner.addLeadingZeroForYear(date[2]) : '');
 	            }
 	        }, '');
 	    },
@@ -1993,6 +1996,10 @@ return /******/ (function(modules) { // webpackBootstrap
 
 	    addLeadingZero: function addLeadingZero(number) {
 	        return (number < 10 ? '0' : '') + number;
+	    },
+
+	    addLeadingZeroForYear: function addLeadingZeroForYear(number) {
+	        return (number < 10 ? '000' : number < 100 ? '00' : number < 1000 ? '0' : '') + number;
 	    }
 	};
 

diff --git a/dist/cleave-react-node.min.js b/dist/cleave-react-node.min.js
diff --git a/dist/cleave-react.js b/dist/cleave-react.js
@@ -2116,7 +2116,8 @@ return /******/ (function(modules) { // webpackBootstrap
 	            yearStartIndex = 0,
 	            day,
 	            month,
-	            year;
+	            year,
+	            fullYearDone = false;
 
 	        // mm-dd || dd-mm
 	        if (value.length === 4 && datePattern[0].toLowerCase() !== 'y' && datePattern[1].toLowerCase() !== 'y') {
@@ -2152,6 +2153,8 @@ return /******/ (function(modules) { // webpackBootstrap
 	            month = parseInt(value.slice(monthStartIndex, monthStartIndex + 2), 10);
 	            year = parseInt(value.slice(yearStartIndex, yearStartIndex + 4), 10);
 
+	            fullYearDone = value.slice(yearStartIndex, yearStartIndex + 4).length === 4;
+
 	            date = this.getFixedDate(day, month, year);
 	        }
 
@@ -2164,7 +2167,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	                case 'm':
 	                    return previous + owner.addLeadingZero(date[1]);
 	                default:
-	                    return previous + '' + (date[2] || '');
+	                    return previous + (fullYearDone ? owner.addLeadingZeroForYear(date[2]) : '');
 	            }
 	        }, '');
 	    },
@@ -2187,6 +2190,10 @@ return /******/ (function(modules) { // webpackBootstrap
 
 	    addLeadingZero: function addLeadingZero(number) {
 	        return (number < 10 ? '0' : '') + number;
+	    },
+
+	    addLeadingZeroForYear: function addLeadingZeroForYear(number) {
+	        return (number < 10 ? '000' : number < 100 ? '00' : number < 1000 ? '0' : '') + number;
 	    }
 	};
 

diff --git a/dist/cleave-react.min.js b/dist/cleave-react.min.js
diff --git a/dist/cleave.js b/dist/cleave.js
@@ -666,7 +666,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	        var owner = this, datePattern = owner.datePattern, date = [],
 	            dayIndex = 0, monthIndex = 0, yearIndex = 0,
 	            dayStartIndex = 0, monthStartIndex = 0, yearStartIndex = 0,
-	            day, month, year;
+	            day, month, year, fullYearDone = false;
 
 	        // mm-dd || dd-mm
 	        if (value.length === 4 && datePattern[0].toLowerCase() !== 'y' && datePattern[1].toLowerCase() !== 'y') {
@@ -702,6 +702,8 @@ return /******/ (function(modules) { // webpackBootstrap
 	            month = parseInt(value.slice(monthStartIndex, monthStartIndex + 2), 10);
 	            year = parseInt(value.slice(yearStartIndex, yearStartIndex + 4), 10);
 
+	            fullYearDone = value.slice(yearStartIndex, yearStartIndex + 4).length === 4;
+
 	            date = this.getFixedDate(day, month, year);
 	        }
 
@@ -714,7 +716,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	            case 'm':
 	                return previous + owner.addLeadingZero(date[1]);
 	            default:
-	                return previous + '' + (date[2] || '');
+	                return previous + (fullYearDone ? owner.addLeadingZeroForYear(date[2]) : '');
 	            }
 	        }, '');
 	    },
@@ -737,6 +739,10 @@ return /******/ (function(modules) { // webpackBootstrap
 
 	    addLeadingZero: function (number) {
 	        return (number < 10 ? '0' : '') + number;
+	    },
+
+	    addLeadingZeroForYear: function (number) {
+	        return (number < 10 ? '000' : (number < 100 ? '00' : (number < 1000 ? '0' : ''))) + number;
 	    }
 	};