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

fix(datepicker): initDate does not change #6638

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix(datepicker): initDate does not change #6638

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 6 additions & 2 deletions src/datepicker/datepicker.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,10 +164,14 @@ angular.module('ui.bootstrap.datepicker', ['ui.bootstrap.dateparser', 'ui.bootst
ngModelOptions = extractOptions(ngModelCtrl);

if ($scope.datepickerOptions.initDate) {
self.activeDate = dateParser.fromTimezone($scope.datepickerOptions.initDate, ngModelOptions.getOption('timezone')) || new Date();
// self.activeDate = dateParser.fromTimezone($scope.datepickerOptions.initDate, ngModelOptions.getOption('timezone')) || new Date();
var newInitDate = dateParser.fromTimezone($scope.datepickerOptions.initDate, ngModelOptions.getOption('timezone')) || new Date();
self.activeDate = angular.isDate(newInitDate) ? new Date(newInitDate.getTime()) : newInitDate;
$scope.$watch('datepickerOptions.initDate', function(initDate) {
if (initDate && (ngModelCtrl.$isEmpty(ngModelCtrl.$modelValue) || ngModelCtrl.$invalid)) {
self.activeDate = dateParser.fromTimezone(initDate, ngModelOptions.getOption('timezone'));
// self.activeDate = dateParser.fromTimezone(initDate, ngModelOptions.getOption('timezone'));
var updatedInitDate = dateParser.fromTimezone(initDate, ngModelOptions.getOption('timezone'));
self.activeDate = angular.isDate(updatedInitDate) ? new Date(updatedInitDate.getTime()) : updatedInitDate;
self.refreshView();
}
});
Expand Down
24 changes: 22 additions & 2 deletions src/datepicker/test/datepicker.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1535,10 +1535,13 @@ describe('datepicker', function() {
});

describe('`init-date`', function() {
var expectedYear = 1980;
var expectedMonth = 10;
var expectedDay = 22;
beforeEach(inject(function() {
$rootScope.date = null;
$rootScope.options = {
initDate: new Date('November 9, 1980')
initDate: new Date(expectedYear, expectedMonth, expectedDay)
};
element = $compile('<div uib-datepicker ng-model="date" datepicker-options="options"></div>')($rootScope);
$rootScope.$digest();
Expand All @@ -1550,7 +1553,24 @@ describe('datepicker', function() {

it('shows the correct title', function() {
expect(getTitle()).toBe('November 1980');
});
});

it('does not change on click Next', function(){
clickNextButton();
var initDate = $rootScope.options.initDate;
var actual = initDate.getFullYear() + '-' + (initDate.getMonth()+1) + '-' + initDate.getDate();
var expected = expectedYear + '-' + (expectedMonth+1) + '-' + expectedDay;

expect(actual).toBe(expected);
});
it('does not change on click Previous', function(){
clickPreviousButton();
var initDate = $rootScope.options.initDate;
var actual = initDate.getFullYear() + '-' + (initDate.getMonth()+1) + '-' + initDate.getDate();
var expected = expectedYear + '-' + (expectedMonth+1) + '-' + expectedDay;

expect(actual).toBe(expected);
});
});

describe('`datepicker-mode`', function() {
Expand Down