fix(datepickerPopup): apply timezone conversion

- Apply timezone conversion to selecting today Closes #6173 Fixes #6147
angular-ui · Aug 18, 2016 · f147d22 · f147d22
1 parent f798a47
commit f147d22
Showing 1 changed file with 2 additions and 1 deletion.
diff --git 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);