fix(collectionRepeat): properly display sibling elements after a coll…

…ection-repeat
ionic-team · Jan 21, 2015 · 7913ee0 · 7913ee0
1 parent 0e11a08
commit 7913ee0
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 5 deletions.
diff --git a/js/angular/directive/collectionRepeat.js b/js/angular/directive/collectionRepeat.js
@@ -228,7 +228,6 @@ function($collectionRepeatManager, $collectionDataSource, $parse) {
             before = false;
           } else {
             if (node.hasAttribute('collection-repeat-ignore')) return;
-            if (node.nodeName === 'ION-INFINITE-SCROLL')return;
             var width = node.offsetWidth;
             var height = node.offsetHeight;
             if (width && height) {

diff --git a/js/angular/service/collectionRepeatDataSource.js b/js/angular/service/collectionRepeatDataSource.js
@@ -86,9 +86,8 @@ function($cacheFactory, $parse, $rootScope) {
       // Subtract so we start at the beginning of this.data, after
       // this.beforeSiblings.
       index -= this.dataStartIndex;
-
       if (index > this.data.length - 1) {
-        return this.afterSiblings[index - this.dataStartIndex];
+        return this.afterSiblings[index - this.data.length];
       }
 
       var item = this.getItem(index);

diff --git a/test/unit/angular/service/collectionDataSource.unit.js b/test/unit/angular/service/collectionDataSource.unit.js
@@ -2,7 +2,7 @@ describe('$collectionDataSource service', function() {
 
   beforeEach(module('ionic'));
 
-  function setup(options, template) {
+  function setup(options, template, dataSourceOptions) {
     var dataSource;
     inject(function($rootScope, $compile, $collectionDataSource) {
       options = angular.extend({
@@ -24,6 +24,9 @@ describe('$collectionDataSource service', function() {
       dataSource.dataStartIndex = 0;
       dataSource.beforeSiblings = [];
       dataSource.afterSiblings = [];
+      if (dataSourceOptions && dataSourceOptions.afterSiblings) {
+        dataSource.afterSiblings = dataSourceOptions.afterSiblings;
+      }
     });
     return dataSource;
   }
@@ -123,7 +126,13 @@ describe('$collectionDataSource service', function() {
     it('should return a value with index values set and put in attachedItems', inject(function($rootScope) {
       var source = setup({
         keyExpr: 'value'
-      });
+      }, null, {afterSiblings:[{
+        width: 50,
+        height: 50,
+        element: angular.element('<div class="tail"></div>'),
+        scope: null,
+        isOutside: true
+      }]});
       source.data = ['a', 'b', 'c'];
       source.dimensions = ['a','b','c'];
       spyOn(source, 'getItem').andCallFake(function() {
@@ -159,6 +168,11 @@ describe('$collectionDataSource service', function() {
         1: item2,
         2: item3
       });
+
+      var item4 = source.attachItemAtIndex(3);
+
+      expect(item4.width).toEqual(50);
+      expect(item4.isOutside).toEqual(true);
     }));
   });