fixup

Author: Narretz

src/ngMessages/messages.js

@@ -665,7 +665,7 @@ function ngMessageDirectiveFactory() {
           assignRecords(staticExp);
         }
 
-        var currentElement, currentScope, messageCtrl;
+        var currentElement, messageCtrl;
         ngMessagesCtrl.register(commentNode, messageCtrl = {
           test: function(name) {
             return contains(records, name);
@@ -675,7 +675,6 @@ function ngMessageDirectiveFactory() {
               $transclude(function(elm, newScope) {
                 $animate.enter(elm, null, element);
                 currentElement = elm;
-                currentScope = newScope;
 
                 // Each time we attach this node to a message we get a new id that we can match
                 // when we are destroying the node later.
@@ -689,6 +688,7 @@ function ngMessageDirectiveFactory() {
                     ngMessagesCtrl.deregister(commentNode);
                     messageCtrl.detach();
                   }
+                  newScope.$destroy();
                 });
               });
             }
@@ -698,8 +698,6 @@ function ngMessageDirectiveFactory() {
               var elm = currentElement;
               currentElement = null;
               $animate.leave(elm);
-              currentScope && currentScope.$destroy();
-              currentScope = null;
             }
           }
         });

test/ngMessages/messagesSpec.js

@@ -1,6 +1,6 @@
 'use strict';
 
-fdescribe('ngMessages', function() {
+describe('ngMessages', function() {
   beforeEach(inject.strictDi());
   beforeEach(module('ngMessages'));
 
@@ -608,23 +608,6 @@ fdescribe('ngMessages', function() {
 
   it('should clean-up the ngMessage scope when a message is removed',
     inject(function($compile, $rootScope) {
-      function countWatchers() {
-        var scope = $rootScope;
-        var watchers = 0;
-
-        while (scope) {
-          watchers += scope.$$watchers.length;
-          if (scope.$$childHead) {
-            scope = scope.$$childHead;
-          } else if (scope.$$nextSibling) {
-            scope = scope.$$nextSibling;
-          } else {
-            scope = null;
-          }
-        }
-
-        return watchers;
-      }
 
       var html =
           '<div ng-messages="items">' +
@@ -638,14 +621,14 @@ fdescribe('ngMessages', function() {
       });
 
       expect(element.text()).toBe('A');
-      var watchers = countWatchers();
+      var watchers = $rootScope.$countWatchers();
 
       $rootScope.$apply('items.a = false');
 
       expect(element.text()).toBe('');
       // We don't know exactly how many watchers are on the scope, only that there should be
       // one less now
-      expect(countWatchers()).toBe(watchers-1);
+      expect($rootScope.$countWatchers()).toBe(watchers - 1);
     })
   );