feat(modal): dismiss all modals on $locationChangeSuccess

Closes #1334
angular-ui · Jan 9, 2014 · a250d91 · a250d91
1 parent 6eb9c2a
commit a250d91
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 1 deletion.
diff --git a/src/modal/modal.js b/src/modal/modal.js
@@ -132,6 +132,14 @@ angular.module('ui.bootstrap.modal', ['ui.bootstrap.transition'])
         }
       });
 
+      $rootScope.$on('$locationChangeSuccess', function () {
+        var topModal = $modalStack.getTop();
+        while (topModal) {
+          $modalStack.dismiss(topModal.key, '$locationChangeSuccess');
+          topModal = $modalStack.getTop();
+        }
+      });
+
       function removeModalWindow(modalInstance) {
 
         var body = $document.find('body').eq(0);

diff --git a/src/modal/test/modal.spec.js b/src/modal/test/modal.spec.js
@@ -229,7 +229,6 @@ describe('$modal', function () {
       expect($document).toHaveModalOpenWithContent('Content', 'div');
       expect($document).not.toHaveBackdrop();
     });
-
   });
 
   describe('option by option', function () {
@@ -487,5 +486,19 @@ describe('$modal', function () {
       dismiss(modal2);
       expect(body).not.toHaveClass('modal-open');
     });
+
+    it('should close all open modals on $locationChangeSuccess', function () {
+      var modal1 = open({template: '<div>Modal1</div>'});
+      var modal2 = open({template: '<div>Modal2</div>'});
+
+      $rootScope.$digest();
+      expect($document).toHaveModalsOpen(2);
+
+      $rootScope.$broadcast('$locationChangeSuccess');
+      $timeout.flush();
+      $rootScope.$digest();
+
+      expect($document).toHaveModalsOpen(0);
+    });
   });
 });