fix(datepicker): correctly display pre-100 years

- Fix display of dates in datepicker for years less than 100 Closes #4812 Fixes #4032
angular-ui · Nov 3, 2015 · beabb4a · beabb4a
1 parent fc61e17
commit beabb4a
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 3 deletions.
diff --git a/src/dateparser/dateparser.js b/src/dateparser/dateparser.js
@@ -246,6 +246,7 @@ angular.module('ui.bootstrap.dateparser', [])
           dt = new Date(fields.year, fields.month, fields.date,
             fields.hours, fields.minutes, fields.seconds,
             fields.milliseconds || 0);
+          dt.setFullYear(fields.year);
         }
       }
 

diff --git a/src/dateparser/test/dateparser.spec.js b/src/dateparser/test/dateparser.spec.js
@@ -1,9 +1,11 @@
 describe('date parser', function() {
-  var dateParser;
+  var dateParser, oldDate;
 
   beforeEach(module('ui.bootstrap.dateparser'));
   beforeEach(inject(function (uibDateParser) {
     dateParser = uibDateParser;
+    oldDate = new Date(1, 2, 6);
+    oldDate.setFullYear(1);
   }));
 
   function expectParse(input, format, date) {
@@ -23,6 +25,7 @@ describe('date parser', function() {
       expectParse('10.01/1983', 'dd.MM/yyyy', new Date(1983, 0, 10, 0));
       expectParse('11-09-1980', 'MM-dd-yyyy', new Date(1980, 10, 9, 0));
       expectParse('2011/02/05', 'yyyy/MM/dd', new Date(2011, 1, 5, 0));
+      expectParse('0001/03/06', 'yyyy/MM/dd', oldDate);
     });
 
     it('should work correctly for `yy`', function() {
@@ -48,13 +51,15 @@ describe('date parser', function() {
       expectParse('05-March-1980', 'dd-MMMM-yyyy', new Date(1980, 2, 5, 0));
       expectParse('February/05/1980', 'MMMM/dd/yyyy', new Date(1980, 1, 5, 0));
       expectParse('1949/December/20', 'yyyy/MMMM/dd', new Date(1949, 11, 20, 0));
+      expectParse('0001/March/06', 'yyyy/MMMM/dd', oldDate);
     });
 
     it('should work correctly for `MMM`', function() {
       expectParse('30.Sep.10', 'dd.MMM.yy', new Date(2010, 8, 30, 0));
       expectParse('02-May-11', 'dd-MMM-yy', new Date(2011, 4, 2, 0));
       expectParse('Feb/05/1980', 'MMM/dd/yyyy', new Date(1980, 1, 5, 0));
       expectParse('1955/Feb/05', 'yyyy/MMM/dd', new Date(1955, 1, 5, 0));
+      expectParse('0001/Mar/06', 'yyyy/MMM/dd', oldDate);
     });
 
     it('should work correctly for `M`', function() {
@@ -73,13 +78,15 @@ describe('date parser', function() {
       expectParse('2/05/1980', 'M!/dd/yyyy', new Date(1980, 1, 5, 0));
       expectParse('1955/2/05', 'yyyy/M!/dd', new Date(1955, 1, 5, 0));
       expectParse('02-5-11', 'dd-M!-yy', new Date(2011, 4, 2, 0));
+      expectParse('0001/3/06', 'yyyy/M!/dd', oldDate);
 
       expectParse('08/11/2013', 'M!/dd/yyyy', new Date(2013, 7, 11, 0));
       expectParse('07.11.05', 'dd.M!.yy', new Date(2005, 10, 7, 0));
       expectParse('02-05-11', 'dd-M!-yy', new Date(2011, 4, 2, 0));
       expectParse('02/05/1980', 'M!/dd/yyyy', new Date(1980, 1, 5, 0));
       expectParse('1955/02/05', 'yyyy/M!/dd', new Date(1955, 1, 5, 0));
       expectParse('02-05-11', 'dd-M!-yy', new Date(2011, 4, 2, 0));
+      expectParse('0001/03/06', 'yyyy/M!/dd', oldDate);
     });
 
     it('should work correctly for `d`', function() {
@@ -88,6 +95,7 @@ describe('date parser', function() {
       expectParse('February/5/1980', 'MMMM/d/yyyy', new Date(1980, 1, 5, 0));
       expectParse('1955/February/5', 'yyyy/MMMM/d', new Date(1955, 1, 5, 0));
       expectParse('11-08-13', 'd-MM-yy', new Date(2013, 7, 11, 0));
+      expectParse('0001/03/6', 'yyyy/MM/d', oldDate);
     });
 
     it('should work correctly for `d!`', function() {
@@ -96,12 +104,14 @@ describe('date parser', function() {
       expectParse('February/5/1980', 'MMMM/d!/yyyy', new Date(1980, 1, 5, 0));
       expectParse('1955/February/5', 'yyyy/MMMM/d!', new Date(1955, 1, 5, 0));
       expectParse('11-08-13', 'd!-MM-yy', new Date(2013, 7, 11, 0));
+      expectParse('0001/03/6', 'yyyy/MM/d!', oldDate);
 
       expectParse('17.November.13', 'd!.MMMM.yy', new Date(2013, 10, 17, 0));
       expectParse('08-March-1991', 'd!-MMMM-yyyy', new Date(1991, 2, 8, 0));
       expectParse('February/05/1980', 'MMMM/d!/yyyy', new Date(1980, 1, 5, 0));
       expectParse('1955/February/05', 'yyyy/MMMM/d!', new Date(1955, 1, 5, 0));
       expectParse('11-08-13', 'd!-MM-yy', new Date(2013, 7, 11, 0));
+      expectParse('0001/03/06', 'yyyy/MM/d!', oldDate);
     });
 
     it('should work correctly for `EEEE`', function() {

diff --git a/src/datepicker/datepicker.js b/src/datepicker/datepicker.js
@@ -280,7 +280,11 @@ angular.module('ui.bootstrap.datepicker', ['ui.bootstrap.dateparser', 'ui.bootst
   };
 
   this.compare = function(date1, date2) {
-    return (new Date(date1.getFullYear(), date1.getMonth(), date1.getDate()) - new Date(date2.getFullYear(), date2.getMonth(), date2.getDate()));
+    var _date1 = new Date(date1.getFullYear(), date1.getMonth(), date1.getDate());
+    var _date2 = new Date(date2.getFullYear(), date2.getMonth(), date2.getDate());
+    _date1.setFullYear(date1.getFullYear());
+    _date2.setFullYear(date2.getFullYear());
+    return _date1 - _date2;
   };
 
   function getISO8601WeekNumber(date) {
@@ -343,7 +347,11 @@ angular.module('ui.bootstrap.datepicker', ['ui.bootstrap.dateparser', 'ui.bootst
   };
 
   this.compare = function(date1, date2) {
-    return new Date(date1.getFullYear(), date1.getMonth()) - new Date(date2.getFullYear(), date2.getMonth());
+    var _date1 = new Date(date1.getFullYear(), date1.getMonth());
+    var _date2 = new Date(date2.getFullYear(), date2.getMonth());
+    _date1.setFullYear(date1.getFullYear());
+    _date2.setFullYear(date2.getFullYear());
+    return _date1 - _date2;
   };
 
   this.handleKeyDown = function(key, evt) {