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

Commit 570dba9

Browse files
mme-privatepkozlowski-opensource
authored andcommittedOct 27, 2013
fix(datepicker): properly handle showWeeks config option
Closes #1132
1 parent 253c49f commit 570dba9

File tree

2 files changed

+27
-3
lines changed

2 files changed

+27
-3
lines changed
 

‎src/datepicker/datepicker.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -261,8 +261,8 @@ angular.module('ui.bootstrap.datepicker', ['ui.bootstrap.position'])
261261
appendToBody: false
262262
})
263263

264-
.directive('datepickerPopup', ['$compile', '$parse', '$document', '$position', 'dateFilter', 'datepickerPopupConfig',
265-
function ($compile, $parse, $document, $position, dateFilter, datepickerPopupConfig) {
264+
.directive('datepickerPopup', ['$compile', '$parse', '$document', '$position', 'dateFilter', 'datepickerPopupConfig', 'datepickerConfig',
265+
function ($compile, $parse, $document, $position, dateFilter, datepickerPopupConfig, datepickerConfig) {
266266
return {
267267
restrict: 'EA',
268268
require: 'ngModel',
@@ -406,7 +406,7 @@ function ($compile, $parse, $document, $position, dateFilter, datepickerPopupCon
406406
if (attrs.showWeeks) {
407407
addWatchableAttribute(attrs.showWeeks, 'showWeeks', 'show-weeks');
408408
} else {
409-
scope.showWeeks = true;
409+
scope.showWeeks = datepickerConfig.showWeeks;
410410
datepickerEl.attr('show-weeks', 'showWeeks');
411411
}
412412
if (attrs.dateDisabled) {

‎src/datepicker/test/datepicker.spec.js

+24
Original file line numberDiff line numberDiff line change
@@ -1259,6 +1259,30 @@ describe('datepicker directive', function () {
12591259
expect(elm.children().length).toEqual(1);
12601260
});
12611261
});
1262+
1263+
describe('with setting datepickerConfig.showWeeks to false', function() {
1264+
var originalConfig = {};
1265+
beforeEach(inject(function(datepickerConfig) {
1266+
angular.extend(originalConfig, datepickerConfig);
1267+
datepickerConfig.showWeeks = false;
1268+
1269+
var wrapElement = $compile('<div><input ng-model="date" datepicker-popup><div>')($rootScope);
1270+
$rootScope.$digest();
1271+
assignElements(wrapElement);
1272+
}));
1273+
afterEach(inject(function(datepickerConfig) {
1274+
// return it to the original state
1275+
angular.extend(datepickerConfig, originalConfig);
1276+
}));
1277+
1278+
it('changes initial visibility for weeks', function() {
1279+
expect(getLabelsRow().find('th').eq(0).css('display')).toBe('none');
1280+
var tr = element.find('tbody').find('tr');
1281+
for (var i = 0; i < 5; i++) {
1282+
expect(tr.eq(i).find('td').eq(0).css('display')).toBe('none');
1283+
}
1284+
});
1285+
});
12621286
});
12631287
});
12641288

0 commit comments

Comments
 (0)