fix(datepicker popup): convert non-date values to date before parsing

Fixes angular-ui#5871
mebibou · May 4, 2016 · 2e381e7 · 2e381e7
1 parent a417ec2
commit 2e381e7
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/datepickerPopup/popup.js b/src/datepickerPopup/popup.js
@@ -133,12 +133,12 @@ function($scope, $element, $attrs, $compile, $log, $parse, $window, $document, $
           return value;
         }
 
-        $scope.date = dateParser.fromTimezone(value, timezone);
-
-        if (angular.isNumber($scope.date)) {
-          $scope.date = new Date($scope.date);
+        if (angular.isNumber(value)) {
+          value = new Date(value);
         }
 
+        $scope.date = dateParser.fromTimezone(value, timezone);
+
         return dateParser.filter($scope.date, dateFormat);
       });
     } else {