fix(rxNotify): message dismissed if scope being watched is destroyed

rackerlabs · Mar 5, 2014 · fbfa4d2 · fbfa4d2
1 parent 0947baf
commit fbfa4d2
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 14 deletions.
diff --git a/src/rxNotify/rxNotify.js b/src/rxNotify/rxNotify.js
@@ -106,6 +106,11 @@ angular.module('encore.ui.rxNotify', ['ngSanitize'])
             cb = addToStack;
         } else if (changeType == 'dismiss') {
             cb = dismiss;
+
+            // add a listener to dismiss message if scope is destroyed
+            scope.$on('$destroy', function () {
+                dismiss(message);
+            });
         }
 
         scope.$watch(prop, function (newVal) {
@@ -215,17 +220,6 @@ angular.module('encore.ui.rxNotify', ['ngSanitize'])
         addAllNext();
     });
 
-    // if page changes, cancel messages waiting on variable updates
-    $rootScope.$on('$routeChangeStart', function () {
-        _.each(stacks, function (stack) {
-            _.each(stack, function (message) {
-                if (_.isArray(message.dismiss)) {
-                    dismiss(message);
-                }
-            });
-        });
-    });
-
     // expose public API
     return {
         add: add,

diff --git a/src/rxNotify/rxNotify.spec.js b/src/rxNotify/rxNotify.spec.js
@@ -264,7 +264,7 @@ describe('rxNotify', function () {
             expect(notifySvc.stacks[defaultStack].length).to.equal(0);
         });
 
-        it('should dismiss message waiting on scope update if page changed', function () {
+        it('should dismiss message waiting on scope update if scope destroyed', function () {
             // set expression to equal true (showing)
             scope.loaded = false;
 
@@ -276,8 +276,7 @@ describe('rxNotify', function () {
             // validate in stack
             expect(notifySvc.stacks[defaultStack][0]).to.eql(msg);
 
-            // simulate route change
-            rootScope.$broadcast('$routeChangeStart');
+            scope.$destroy();
 
             // validate not in stack
             expect(notifySvc.stacks[defaultStack].length).to.equal(0);