From f147d22f5c3ea01968cfe7f78fe6049a82d6808d Mon Sep 17 00:00:00 2001 From: Wesley Cho Date: Thu, 18 Aug 2016 10:33:22 -0700 Subject: [PATCH] fix(datepickerPopup): apply timezone conversion - Apply timezone conversion to selecting today Closes #6173 Fixes #6147 --- src/datepickerPopup/popup.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/datepickerPopup/popup.js b/src/datepickerPopup/popup.js index fb2b62452a..1821ffa445 100644 --- a/src/datepickerPopup/popup.js +++ b/src/datepickerPopup/popup.js @@ -242,7 +242,8 @@ function($scope, $element, $attrs, $compile, $log, $parse, $window, $document, $ date = new Date($scope.date); date.setFullYear(today.getFullYear(), today.getMonth(), today.getDate()); } else { - date = new Date(today.setHours(0, 0, 0, 0)); + date = dateParser.fromTimezone(today, ngModelOptions.timezone); + date.setHours(0, 0, 0, 0); } } $scope.dateSelection(date);