From 9fb59104be1f4d230637a9607267104b0fdbe644 Mon Sep 17 00:00:00 2001 From: Dave Anderson Date: Mon, 16 Nov 2015 22:52:24 -0500 Subject: [PATCH] fix(datepicker): min-date: timezone fix for literals v2 --- src/datepicker/datepicker.js | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/src/datepicker/datepicker.js b/src/datepicker/datepicker.js index c1f67cb913..7ae47df4a4 100644 --- a/src/datepicker/datepicker.js +++ b/src/datepicker/datepicker.js @@ -629,16 +629,13 @@ function(scope, element, attrs, $compile, $parse, $document, $rootScope, $positi scope.$parent.$watch(getAttribute, function(value) { scope.watchData[key] = value; if (key === 'minDate' || key === 'maxDate') { - var date = parseDate(value); - if (!date) { - date = new Date(value); - if (angular.isDate(date) && !isNaN(date)) { - var dateArray = date.toJSON().split('T')[0].split('-'); - date = new Date(+dateArray[0], +dateArray[1] - 1, +dateArray[2]); - date.setFullYear(+dateArray[0]); - } + date = new Date(value); + if (angular.isString(value) && angular.isDate(date) && !isNaN(date)) { + 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; } - scope.watchData[key] = date; cache[key] = date; } });