fix(datepicker): min-date: timezone fix for literals tweaks

* toISOString -> toJSON (equivalent) * date.setYear fix * fix test to capture date-format mismatch edge case in #3437
angular-ui · Nov 9, 2015 · 495e91f · 495e91f
1 parent b799c53
commit 495e91f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/datepicker/datepicker.js b/src/datepicker/datepicker.js
@@ -633,8 +633,9 @@ function(scope, element, attrs, $compile, $parse, $document, $rootScope, $positi
             if (!date) {
               date = new Date(value);
               if (angular.isDate(date) && !isNaN(date)) {
-                var dateArray = date.toISOString().split('T')[0].split('-');
+                var dateArray = date.toJSON().split('T')[0].split('-');
                 date = new Date(+dateArray[0], +dateArray[1] - 1, +dateArray[2]);
+                date.setFullYear(+dateArray[0]);
               }
             }
             scope.watchData[key] = date;

diff --git a/src/datepicker/test/datepicker.spec.js b/src/datepicker/test/datepicker.spec.js
@@ -1950,8 +1950,8 @@ describe('datepicker directive', function() {
 
           it('should disable today button if before min date, literal case', function() {
             var minDate = new Date(new Date().setDate(new Date().getDate() + 1));
-            var literalMinDate = minDate.toISOString().split('T')[0];
-            var wrapElement = $compile('<div><input ng-model="date" uib-datepicker-popup min-date="\'' + literalMinDate + '\'" is-open="true"><div>')($rootScope);
+            var literalMinDate = minDate.toJSON().split('T')[0];
+            var wrapElement = $compile('<div><input ng-model="date" uib-datepicker-popup="MM/dd/yyyy" min-date="\'' + literalMinDate + '\'" is-open="true"><div>')($rootScope);
             $rootScope.$digest();
             assignElements(wrapElement);
             assignButtonBar();