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

Fixed #3143: fixed functionality of 'show-weeks' attribute on datepicker popup #3149

Closed
ankit5990 wants to merge 7 commits into from
Closed

Fixed #3143: fixed functionality of 'show-weeks' attribute on datepicker popup #3149

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
0f8c8b4
fix(datepicker): memory leak fix for datepicker.
Sep 10, 2014
0659a5e
Merge remote-tracking branch 'upstream/master'
ankit5990 Jan 2, 2015
9f03d40
fix(datepicker): fixed working of 'show-weeks' on datepickerPopup
ankit5990 Jan 2, 2015
c645db3
fix(datepicker): fixed 'show-weeks' datepickerPopup. resolved conflict
ankit5990 Mar 31, 2015
e8c0d39
Merge remote-tracking branch 'upstream/master'
Apr 1, 2015
9b00506
Merge remote-tracking branch 'upstream/master'
Apr 2, 2015
ec04cb4
fix(datepicker): fixed 'show-weeks' datepickerPopup. added tests.
Apr 3, 2015
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
Prev Previous commit
fix(datepicker): fixed 'show-weeks' datepickerPopup. added tests.
  • Loading branch information
Ankit Kumar committed Apr 3, 2015
commit ec04cb4710a54def4ecce54f570cfe5eecb4086e
4 changes: 2 additions & 2 deletions src/datepicker/datepicker.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -530,8 +530,8 @@ function ($compile, $parse, $document, $position, dateFilter, dateParser, datepi
datepickerEl.attr('date-disabled', 'dateDisabled({ date: date, mode: mode })');
}

if(attrs.showWeeks) {
datepickerEl.attr('show-weeks',attrs.showWeeks);
if (attrs.showWeeks) {
datepickerEl.attr('show-weeks', attrs.showWeeks);
}

if (attrs.customClass){
Expand Down
24 changes: 24 additions & 0 deletions src/datepicker/test/datepicker.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1640,6 +1640,30 @@ describe('datepicker directive', function () {
assignElements(wrapElement);
expect(dropdownEl.find('li').length).toBe(1);
});

it('should hide weeks column on popup', function() {
var wrapElement = $compile('<div><input ng-model="date" datepicker-popup show-weeks="false"><div>')($rootScope);
$rootScope.$digest();
assignElements(wrapElement);

expect(getLabelsRow().find('th').eq(0)).toBeHidden();
var tr = element.find('tbody').find('tr');
for (var i = 0; i < 5; i++) {
expect(tr.eq(i).find('td').eq(0)).toBeHidden();
}
});

it('should show weeks column on popup', function() {
var wrapElement = $compile('<div><input ng-model="date" datepicker-popup show-weeks="true"><div>')($rootScope);
$rootScope.$digest();
assignElements(wrapElement);

expect(getLabelsRow().find('th').eq(0)).not.toBeHidden();
var tr = element.find('tbody').find('tr');
for (var i = 0; i < 5; i++) {
expect(tr.eq(i).find('td').eq(0)).not.toBeHidden();
}
});
});

describe('`ng-change`', function() {
Expand Down