close modal on location change

joeprisk · Jan 16, 2015 · 0a9606c · 0a9606c
1 parent 3bfb3e7
commit 0a9606c
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 23 deletions.
diff --git a/dst/angular-modal-service.js b/dst/angular-modal-service.js
@@ -134,19 +134,23 @@
             };
 
             //  When close is resolved, we'll clean up the scope and element.
-            modal.close.then(function(result) {
-              //  Clean up the scope
-              modalScope.$destroy();
-              //  Remove the element from the dom.
-              modalElement.remove();
+            modal.close.then(closeModal);
 
-              // Remove bodyClass
-              if (options.bodyClass) {
-                body.removeClass(options.bodyClass);
+            deferred.resolve(modal);
+
+              function closeModal(result) {
+                //  Clean up the scope
+                modalScope.$destroy();
+                //  Remove the element from the dom.
+                modalElement.remove();
+
+                // Remove bodyClass
+                if (options.bodyClass) {
+                  body.removeClass(options.bodyClass);
+                }
               }
-            });
 
-            deferred.resolve(modal);
+              $rootScope.$on('$locationChangeSuccess', closeModal);
 
           })
           .catch(function(error) {

diff --git a/dst/angular-modal-service.min.js b/dst/angular-modal-service.min.js
diff --git a/dst/angular-modal-service.min.js.map b/dst/angular-modal-service.min.js.map
diff --git a/src/angular-modal-service.js b/src/angular-modal-service.js
@@ -134,19 +134,23 @@
             };
 
             //  When close is resolved, we'll clean up the scope and element.
-            modal.close.then(function(result) {
-              //  Clean up the scope
-              modalScope.$destroy();
-              //  Remove the element from the dom.
-              modalElement.remove();
+            modal.close.then(closeModal);
 
-              // Remove bodyClass
-              if (options.bodyClass) {
-                body.removeClass(options.bodyClass);
+            deferred.resolve(modal);
+
+              function closeModal(result) {
+                //  Clean up the scope
+                modalScope.$destroy();
+                //  Remove the element from the dom.
+                modalElement.remove();
+
+                // Remove bodyClass
+                if (options.bodyClass) {
+                  body.removeClass(options.bodyClass);
+                }
               }
-            });
 
-            deferred.resolve(modal);
+              $rootScope.$on('$locationChangeSuccess', closeModal);
 
           })
           .catch(function(error) {