diff --git a/src/datepicker/datepicker.js b/src/datepicker/datepicker.js index 709d89a39c..c102f9b54d 100644 --- a/src/datepicker/datepicker.js +++ b/src/datepicker/datepicker.js @@ -173,6 +173,8 @@ angular.module('ui.bootstrap.datepicker', ['ui.bootstrap.dateparser', 'ui.bootst dateParser.fromTimezone(new Date(ngModelCtrl.$modelValue), ngModelOptions.timezone) : dateParser.fromTimezone(new Date(), ngModelOptions.timezone); + this.todayDate = dateParser.fromTimezone(new Date(), ngModelOptions.timezone); + ngModelCtrl.$render = function() { self.render(); }; @@ -232,6 +234,10 @@ angular.module('ui.bootstrap.datepicker', ['ui.bootstrap.dateparser', 'ui.bootst $scope.activeDt = dt; } + if (this.compare(dt.date, self.todayDate) === 0) { + $scope.todayDt = dt; + } + return dt; }; diff --git a/src/datepicker/test/datepicker.spec.js b/src/datepicker/test/datepicker.spec.js index f1651eee47..6180331c18 100644 --- a/src/datepicker/test/datepicker.spec.js +++ b/src/datepicker/test/datepicker.spec.js @@ -312,6 +312,16 @@ describe('datepicker', function() { }); }); + it('should have a today date equal to the current date', function() { + var baseTime = new Date(); + jasmine.clock().mockDate(baseTime); + + element = $compile('baz'); diff --git a/template/datepicker/day.html b/template/datepicker/day.html index 69e7007684..a8a59e26d3 100644 --- a/template/datepicker/day.html +++ b/template/datepicker/day.html @@ -19,7 +19,8 @@