fix(datepicker): remove datepicker's popup on scope destroy

angular-ui · Dec 16, 2013 · 48955d6 · 48955d6
1 parent 41bea46
commit 48955d6
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/src/datepicker/datepicker.js b/src/datepicker/datepicker.js
@@ -281,6 +281,7 @@ function ($compile, $parse, $document, $position, dateFilter, datepickerPopupCon
       scope.showButtonBar = angular.isDefined(attrs.showButtonBar) ? originalScope.$eval(attrs.showButtonBar) : datepickerPopupConfig.showButtonBar;
 
       originalScope.$on('$destroy', function() {
+        $popup.remove();
         scope.$destroy();
       });
 

diff --git a/src/datepicker/test/datepicker.spec.js b/src/datepicker/test/datepicker.spec.js
@@ -1298,6 +1298,19 @@ describe('datepicker directive', function () {
         expect($body.children().length).toEqual(bodyLength + 1);
         expect(elm.children().length).toEqual(1);
       });
+      it('should be removed on scope destroy', function() {
+        var $body = $document.find('body'),
+            bodyLength = $body.children().length,
+            isolatedScope = $rootScope.$new(),
+            elm = angular.element(
+              '<input datepicker-popup ng-model="date" datepicker-append-to-body="true"></input>'
+            );
+        $compile(elm)(isolatedScope);
+        isolatedScope.$digest();
+        expect($body.children().length).toEqual(bodyLength + 1);
+        isolatedScope.$destroy();
+        expect($body.children().length).toEqual(bodyLength);
+      });
     });
 
     describe('with setting datepickerConfig.showWeeks to false', function() {