From 8a87c194efd46a09f03274e5a406248fa88fe896 Mon Sep 17 00:00:00 2001 From: Mohamed Dewidar Date: Sun, 30 Jul 2017 20:48:59 +0100 Subject: [PATCH 1/2] fix(datepicker): use current time if date was null Closes #5744 --- src/datepicker/datepicker.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/datepicker/datepicker.js b/src/datepicker/datepicker.js index fd4e263660..54366f1e79 100644 --- a/src/datepicker/datepicker.js +++ b/src/datepicker/datepicker.js @@ -264,7 +264,7 @@ angular.module('ui.bootstrap.datepicker', ['ui.bootstrap.dateparser', 'ui.bootst $scope.select = function(date) { if ($scope.datepickerMode === self.minMode) { - var dt = ngModelCtrl.$viewValue ? dateParser.fromTimezone(new Date(ngModelCtrl.$viewValue), ngModelOptions.getOption('timezone')) : new Date(0, 0, 0, 0, 0, 0, 0); + var dt = ngModelCtrl.$viewValue ? dateParser.fromTimezone(new Date(ngModelCtrl.$viewValue), ngModelOptions.getOption('timezone')) : new Date(); dt.setFullYear(date.getFullYear(), date.getMonth(), date.getDate()); dt = dateParser.toTimezone(dt, ngModelOptions.getOption('timezone')); ngModelCtrl.$setViewValue(dt); From 3b073731f026b7acf0dd254bb98a76342d7bc45b Mon Sep 17 00:00:00 2001 From: Mohamed Dewidar Date: Sun, 30 Jul 2017 21:32:52 +0100 Subject: [PATCH 2/2] refactor(datepicker): remove redundant timezone conversion --- src/datepicker/datepicker.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/datepicker/datepicker.js b/src/datepicker/datepicker.js index 54366f1e79..1890a1ef3f 100644 --- a/src/datepicker/datepicker.js +++ b/src/datepicker/datepicker.js @@ -266,7 +266,6 @@ angular.module('ui.bootstrap.datepicker', ['ui.bootstrap.dateparser', 'ui.bootst if ($scope.datepickerMode === self.minMode) { var dt = ngModelCtrl.$viewValue ? dateParser.fromTimezone(new Date(ngModelCtrl.$viewValue), ngModelOptions.getOption('timezone')) : new Date(); dt.setFullYear(date.getFullYear(), date.getMonth(), date.getDate()); - dt = dateParser.toTimezone(dt, ngModelOptions.getOption('timezone')); ngModelCtrl.$setViewValue(dt); ngModelCtrl.$render(); } else {