fix(datepicker): evaluate show-weeks from datepicker-options

Closes #1532 Closes #1563
angular-ui · Jan 11, 2014 · 92c1715 · 92c1715
1 parent bc8d21c
commit 92c1715
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 3 deletions.
diff --git a/src/datepicker/datepicker.js b/src/datepicker/datepicker.js
@@ -337,9 +337,11 @@ function ($compile, $parse, $document, $position, dateFilter, datepickerPopupCon
         'ng-model': 'date',
         'ng-change': 'dateSelection()'
       });
-      var datepickerEl = angular.element(popupEl.children()[0]);
+      var datepickerEl = angular.element(popupEl.children()[0]),
+          datepickerOptions = {};
       if (attrs.datepickerOptions) {
-        datepickerEl.attr(angular.extend({}, originalScope.$eval(attrs.datepickerOptions)));
+        datepickerOptions = originalScope.$eval(attrs.datepickerOptions);
+        datepickerEl.attr(angular.extend({}, datepickerOptions));
       }
 
       // TODO: reverse from dateFilter string to Date object
@@ -405,7 +407,7 @@ function ($compile, $parse, $document, $position, dateFilter, datepickerPopupCon
       if (attrs.showWeeks) {
         addWatchableAttribute(attrs.showWeeks, 'showWeeks', 'show-weeks');
       } else {
-        scope.showWeeks = datepickerConfig.showWeeks;
+        scope.showWeeks = 'show-weeks' in datepickerOptions ? datepickerOptions['show-weeks'] : datepickerConfig.showWeeks;
         datepickerEl.attr('show-weeks', 'showWeeks');
       }
       if (attrs.dateDisabled) {

diff --git a/src/datepicker/test/datepicker.spec.js b/src/datepicker/test/datepicker.spec.js
@@ -1061,6 +1061,27 @@ describe('datepicker directive', function () {
 
     });
 
+    describe('attribute `datepickerOptions`', function () {
+      var weekHeader, weekElement;
+      beforeEach(function() {
+        $rootScope.opts = {
+          'show-weeks': false
+        };
+        var wrapElement = $compile('<div><input ng-model="date" datepicker-popup datepicker-options="opts" is-open="true"></div>')($rootScope);
+        $rootScope.$digest();
+        assignElements(wrapElement);
+
+        weekHeader = getLabelsRow().find('th').eq(0);
+        weekElement = element.find('tbody').find('tr').eq(1).find('td').eq(0);
+      });
+
+      it('hides week numbers based on variable', function() {
+        expect(weekHeader.text()).toEqual('#');
+        expect(weekHeader).toBeHidden();
+        expect(weekElement).toBeHidden();
+      });
+    });
+
     describe('toggles programatically by `open` attribute', function () {
       beforeEach(inject(function() {
         $rootScope.open = true;