fix(datepicker): Make datepicker respect dateFormat inside ng-if

Makes the datepicker respect dateFormat inside ng-if.
angular-ui · Mar 23, 2015 · 2c2dba6 · 2c2dba6
1 parent b5f220f
commit 2c2dba6
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 4 deletions.
diff --git a/src/datepicker/datepicker.js b/src/datepicker/datepicker.js
@@ -554,10 +554,12 @@ function ($compile, $parse, $document, $position, dateFilter, dateParser, datepi
       });
 
       // Outer change
-      ngModel.$render = function() {
-        var date = ngModel.$viewValue ? dateFilter(parseDate(ngModel.$viewValue), dateFormat) : '';
-        element.val(date);
-        scope.date = parseDate( ngModel.$modelValue );
+      ngModel.$render = function () {
+        if (dateFormat) {
+          var date = ngModel.$viewValue ? dateFilter(parseDate(ngModel.$viewValue), dateFormat) : '';
+          element.val(date);
+          scope.date = parseDate( ngModel.$modelValue );
+        }
       };
 
       var documentClickBind = function(event) {

diff --git a/src/datepicker/test/datepicker.spec.js b/src/datepicker/test/datepicker.spec.js
@@ -1103,6 +1103,25 @@ describe('datepicker directive', function () {
 
   });
 
+  describe('setting datepickerPopupConfig inside ng-if', function() {
+    var originalConfig = {};
+    beforeEach(inject(function (datepickerPopupConfig) {
+      angular.extend(originalConfig, datepickerPopupConfig);
+      datepickerPopupConfig.datepickerPopup = 'MM-dd-yyyy';
+
+      element = $compile('<div><div ng-if="true"><input ng-model="date" datepicker-popup></div></div>')($rootScope);
+      $rootScope.$digest();
+    }));
+    afterEach(inject(function (datepickerPopupConfig) {
+      // return it to the original state
+      angular.extend(datepickerPopupConfig, originalConfig);
+    }));
+
+    it('changes date format', function () {
+      expect(element.find('input').val()).toEqual('09-30-2010');
+    });
+  });
+
   describe('as popup', function () {
     var inputEl, dropdownEl, $document, $sniffer;