Skip to content
This repository has been archived by the owner on May 29, 2019. It is now read-only.

fix(datepicker): dereference date initialization #5643

Closed
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/datepicker/datepicker.js
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,9 @@ angular.module('ui.bootstrap.datepicker', ['ui.bootstrap.dateparser', 'ui.bootst
ngModelCtrl = ngModelCtrl_;
ngModelOptions = ngModelCtrl_.$options || datepickerConfig.ngModelOptions;

this.activeDate = ngModelCtrl.$modelValue || new Date();
this.activeDate = ngModelCtrl.$modelValue ?
dateParser.fromTimezone(new Date(ngModelCtrl.$modelValue), ngModelOptions.timezone) :
dateParser.fromTimezone(new Date(), ngModelOptions.timezone);

ngModelCtrl.$render = function() {
self.render();
Expand Down
7 changes: 7 additions & 0 deletions src/datepicker/test/datepicker.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -1828,6 +1828,13 @@ describe('datepicker', function() {
expect(getTitle()).toBe('January 2014');
});

it('should not change model when going to next month - #5441', function() {
$rootScope.date = new Date('January 30, 2014');
$rootScope.$digest();
clickNextButton();
expect($rootScope.date).toEqual(new Date('January 30, 2014'));
});

describe('when `model` changes', function() {
function testCalendar() {
expect(getTitle()).toBe('November 2005');
Expand Down