use different fix to sustain order for async templates

Author: Narretz

src/ngMessages/messages.js

@@ -415,7 +415,7 @@ angular.module('ngMessages', [])
            forEach(messages, function(item) {
              item.message.detach();
            });
-         })
+         });
 
          this.reRender = function() {
            if (!renderLater) {
@@ -448,19 +448,22 @@ angular.module('ngMessages', [])
            ctrl.reRender();
          };
 
-         function findPreviousMessage(parent, comment, key) {
+         function findPreviousMessage(parent, comment) {
            var prevNode = comment;
            var parentLookup = [];
            while (prevNode && prevNode !== parent) {
              var prevKey = prevNode.$$ngMessageNode;
-             if (prevKey && prevKey.length && prevKey < key) {
+             if (prevKey && prevKey.length) {
                // Only add elements whose key is actually lower than the starting element's
                return messages[prevKey];
              }
 
              // dive deeper into the DOM and examine its children for any ngMessage
              // comments that may be in an element that appears deeper in the list
-             if (prevNode.childNodes.length && parentLookup.indexOf(prevNode) == -1) {
+             if (prevNode.childNodes.length &&
+                prevNode !== comment.parentNode &&
+                parentLookup.indexOf(prevNode) == -1
+              ) {
                parentLookup.push(prevNode);
                prevNode = prevNode.childNodes[prevNode.childNodes.length - 1];
              } else {
@@ -474,7 +477,7 @@ angular.module('ngMessages', [])
            if (!ctrl.head) {
              ctrl.head = messageNode;
            } else {
-             var match = findPreviousMessage(parent, comment, key);
+             var match = findPreviousMessage(parent, comment);
              if (match) {
                messageNode.next = match.next;
                match.next = messageNode;
@@ -488,7 +491,7 @@ angular.module('ngMessages', [])
          function removeMessageNode(parent, comment, key) {
            var messageNode = messages[key];
 
-           var match = findPreviousMessage(parent, comment, key);
+           var match = findPreviousMessage(parent, comment);
            if (match) {
              match.next = messageNode.next;
            } else {

test/ngMessages/messagesSpec.js

@@ -858,42 +858,26 @@ describe('ngMessages', function() {
     }));
   });
 
-  it('should sustain the order when messages are included by a template with an async template', function() {
-    module(function($compileProvider) {
-      $compileProvider.directive('inclusor', function() {
-        return {
-          templateUrl: 'include.html'
-        };
-      });
-    });
-
+  it('should properly detect the previous message, even if it was registered later',
     inject(function($compile, $rootScope, $templateCache) {
-      var html;
-      $templateCache.put('include.html', '<div ng-message="a">A</div>' +
-                                     '<div ng-message="b">B</div>');
-
-      html = '<div ng-messages-multiple ng-messages="items"><div inclusor>' +
-        '</div><div ng-message="c">C</div><div ng-message="d">D</div></div>';
-      $rootScope.items = {};
-
-      $rootScope.$apply(function() {
-        $rootScope.items.b = true;
-        $rootScope.items.d = true;
-      });
+      $templateCache.put('include.html', '<div ng-message="a">A</div>');
+      var html =
+          '<div ng-messages="items">' +
+            '<div ng-include="\'include.html\'"></div>' +
+            '<div ng-message="b">B</div>' +
+            '<div ng-message="c">C</div>' +
+          '</div>';
 
       element = $compile(html)($rootScope);
-      $rootScope.$digest();
-
-      expect(element.text().trim()).toBe('BD');
-
-      $rootScope.$apply(function() {
-        $rootScope.items.a = true;
-        $rootScope.items.c = true;
-      });
+      $rootScope.$apply('items = {b: true, c: true}');
 
-      expect(element.text().trim()).toBe('ABCD');
-    });
+      expect(element.text()).toBe('B');
 
-  });
+      var nodeB = element[0].querySelector('[ng-message="b"]');
+      angular.element(nodeB).remove();
+      $rootScope.$apply('items.a = true');
 
+      expect(element.text()).toBe('A');
+    })
+  );
 });