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

fix(datepicker): works without ng-model #1913

Closed
wants to merge 1 commit into from
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
6 changes: 4 additions & 2 deletions src/datepicker/datepicker.js
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,10 @@ angular.module('ui.bootstrap.datepicker', ['ui.bootstrap.position'])
if ( this.element ) {
this._refreshView();

var date = ngModelCtrl.$modelValue ? new Date(ngModelCtrl.$modelValue) : null;
ngModelCtrl.$setValidity('date-disabled', !date || (this.element && !this.isDisabled(date)));
if (ngModelCtrl.$modelValue) {
var date = ngModelCtrl.$modelValue ? new Date(ngModelCtrl.$modelValue) : null;
ngModelCtrl.$setValidity('date-disabled', !date || (this.element && !this.isDisabled(date)));
}
}
};

Expand Down
33 changes: 33 additions & 0 deletions src/datepicker/test/datepicker.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -690,6 +690,39 @@ describe('datepicker directive', function () {

});

describe('attribute `ng-model`', function() {
var dateFilter, today;
beforeEach(inject(function(_dateFilter_) {
dateFilter = _dateFilter_;
today = new Date();
element = $compile('<datepicker></datepicker>')($rootScope);
$rootScope.$digest();
}));

it('should work without model on day-mode', function() {
var title = dateFilter(today, 'MMMM yyyy');
expect(getTitle()).toBe(title);
});

it('should work without model on month-mode', function() {
clickTitleButton();
var title = dateFilter(today, 'yyyy');
expect(getTitle()).toBe(title);
});

it('should work without model on year-mode', function() {
clickTitleButton();
clickTitleButton();

// Simulate datepicker's algorithm for year ranges
var start = parseInt((today.getFullYear() - 1) / 20, 10) * 20 + 1;
var end = start + 19; // The default range is 20;
var title = start + ' - ' + end;

expect(getTitle()).toBe(title);
});
});

describe('attribute `starting-day`', function () {
beforeEach(function() {
$rootScope.startingDay = 1;
Expand Down