WIP: Fix tranclusion issues with ngRepeat, angular#4002

jeffbcross · Sep 21, 2013 · 8284bcb · 8284bcb
1 parent f12c61e
commit 8284bcb
Show file tree

Hide file tree

Showing 3 changed files with 47 additions and 18 deletions.
diff --git a/src/ng/compile.js b/src/ng/compile.js
@@ -809,6 +809,8 @@ function $CompileProvider($provide) {
             compileNode = $compileNode[0];
             replaceWith(jqCollection, jqLite(sliceArgs($template)), compileNode);
 
+            $template.append(document.createComment(' end ' + directiveName + ': ' + templateAttrs[directiveName] + ' '))
+
             childTranscludeFn = compile($template, transcludeFn, terminalPriority,
                                         replaceDirective && replaceDirective.name);
           } else {
@@ -836,7 +838,7 @@ function $CompileProvider($provide) {
             compileNode = $template[0];
 
             if ($template.length != 1 || compileNode.nodeType !== 1) {
-              throw $compileMinErr('tplrt', "Template for directive '{0}' must have exactly one root element. {1}", directiveName, '');
+              throw $compileMinErr('tplrt', "Template for directive '{0}' must have exactly one root element. {1}", directiveName,  templateAttrs[directiveName] +'');
             }
 
             replaceWith(jqCollection, $compileNode, compileNode);

diff --git a/src/ng/directive/ngRepeat.js b/src/ng/directive/ngRepeat.js
@@ -328,6 +328,7 @@ var ngRepeatDirective = ['$parse', '$animate', function($parse, $animate) {
             if (lastBlockMap.hasOwnProperty(key)) {
               block = lastBlockMap[key];
               $animate.leave(block.elements);
+              dump(block.elements);
               forEach(block.elements, function(element) { element[NG_REMOVED] = true});
               block.scope.$destroy();
             }
@@ -371,6 +372,7 @@ var ngRepeatDirective = ['$parse', '$animate', function($parse, $animate) {
 
             if (!block.startNode) {
               linker(childScope, function(clone) {
+                dump(clone);
                 $animate.enter(clone, null, jqLite(previousNode));
                 previousNode = clone;
                 block.scope = childScope;

diff --git a/test/ng/directive/ngRepeatSpec.js b/test/ng/directive/ngRepeatSpec.js
@@ -843,28 +843,54 @@ describe('ngRepeat', function() {
     });
   });
 
-  it('should grow multi-node repeater', inject(function($compile, $rootScope) {
-    $rootScope.show = false;
-    $rootScope.books = [
-      {title:'T1', description: 'D1'},
-      {title:'T2', description: 'D2'}
-    ];
-    element = $compile(
+
+  describe('ngRepeatStart', function () {
+    it('should grow multi-node repeater', inject(function($compile, $rootScope) {
+      $rootScope.show = false;
+      $rootScope.books = [
+        {title:'T1', description: 'D1'},
+        {title:'T2', description: 'D2'}
+      ];
+      element = $compile(
+          '<div>' +
+              '<dt ng-repeat-start="book in books">{{book.title}}:</dt>' +
+              '<dd ng-repeat-end>{{book.description}};</dd>' +
+          '</div>')($rootScope);
+
+      $rootScope.$digest();
+      expect(element.text()).toEqual('T1:D1;T2:D2;');
+      $rootScope.books.push({title:'T3', description: 'D3'});
+      $rootScope.$digest();
+      expect(element.text()).toEqual('T1:D1;T2:D2;T3:D3;');
+    }));
+
+
+    iit('should not clobber ng-if when updating collection', inject(function ($compile, $rootScope) {
+      $rootScope.values = [1, 2, 3];
+      $rootScope.showMe = true;
+
+      element = $compile(
         '<div>' +
-            '<dt ng-repeat-start="book in books">{{book.title}}:</dt>' +
-            '<dd ng-repeat-end>{{book.description}};</dd>' +
-        '</div>')($rootScope);
+          '<div ng-repeat-start="val in values">Value: {{val}} </div>' +
+          '<div ng-if="showMe" ng-repeat-end>If : {{val}}</div>' +
+        '</div>'
+      )($rootScope);
 
-    $rootScope.$digest();
-    expect(element.text()).toEqual('T1:D1;T2:D2;');
-    $rootScope.books.push({title:'T3', description: 'D3'});
-    $rootScope.$digest();
-    expect(element.text()).toEqual('T1:D1;T2:D2;T3:D3;');
-  }));
+      $rootScope.$digest();
+      expect(element.find('div').length).toBe(6);
 
+      $rootScope.values.shift();
+      $rootScope.values.push(5);
 
+      $rootScope.$digest();
+      dump(element);
+      expect(element.find('div').length).toBe(6);
+      expect(element.text()).not.toContain('If : 1');
+    }));
+  });
 });
 
+
 describe('ngRepeat animations', function() {
   var body, element, $rootElement;
 
@@ -982,5 +1008,4 @@ describe('ngRepeat animations', function() {
       item = $animate.flushNext('move').element;
       expect(item.text()).toBe('1');
   }));
-
 });