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

Commit d0cc728

Browse files
ankit5990chrisirhc
authored andcommitted
fix(datepicker): make 'show-weeks' work on datepickerPopup
Fixes #3143 Closes #3149
1 parent d024dd7 commit d0cc728

File tree

2 files changed

+29
-0
lines changed

2 files changed

+29
-0
lines changed

src/datepicker/datepicker.js

+5
Original file line numberDiff line numberDiff line change
@@ -535,6 +535,11 @@ function ($compile, $parse, $document, $position, dateFilter, dateParser, datepi
535535
if (attrs.dateDisabled) {
536536
datepickerEl.attr('date-disabled', 'dateDisabled({ date: date, mode: mode })');
537537
}
538+
539+
if (attrs.showWeeks) {
540+
datepickerEl.attr('show-weeks', attrs.showWeeks);
541+
}
542+
538543
if (attrs.customClass){
539544
datepickerEl.attr('custom-class', 'customClass({ date: date, mode: mode })');
540545
}

src/datepicker/test/datepicker.spec.js

+24
Original file line numberDiff line numberDiff line change
@@ -1704,6 +1704,30 @@ describe('datepicker directive', function () {
17041704
assignElements(wrapElement);
17051705
expect(dropdownEl.find('li').length).toBe(1);
17061706
});
1707+
1708+
it('should hide weeks column on popup', function() {
1709+
var wrapElement = $compile('<div><input ng-model="date" datepicker-popup show-weeks="false"><div>')($rootScope);
1710+
$rootScope.$digest();
1711+
assignElements(wrapElement);
1712+
1713+
expect(getLabelsRow().find('th').eq(0)).toBeHidden();
1714+
var tr = element.find('tbody').find('tr');
1715+
for (var i = 0; i < 5; i++) {
1716+
expect(tr.eq(i).find('td').eq(0)).toBeHidden();
1717+
}
1718+
});
1719+
1720+
it('should show weeks column on popup', function() {
1721+
var wrapElement = $compile('<div><input ng-model="date" datepicker-popup show-weeks="true"><div>')($rootScope);
1722+
$rootScope.$digest();
1723+
assignElements(wrapElement);
1724+
1725+
expect(getLabelsRow().find('th').eq(0)).not.toBeHidden();
1726+
var tr = element.find('tbody').find('tr');
1727+
for (var i = 0; i < 5; i++) {
1728+
expect(tr.eq(i).find('td').eq(0)).not.toBeHidden();
1729+
}
1730+
});
17071731
});
17081732

17091733
describe('`ng-change`', function() {

0 commit comments

Comments
 (0)