diff --git a/js/angular/directive/collectionRepeat.js b/js/angular/directive/collectionRepeat.js index 7175ea473b3..e01952d843f 100644 --- a/js/angular/directive/collectionRepeat.js +++ b/js/angular/directive/collectionRepeat.js @@ -217,6 +217,8 @@ function($collectionRepeatManager, $collectionDataSource, $parse) { rerender(value); }); + // Find every sibling before and after the repeated items, and pass them + // to the dataSource var scrollViewContent = scrollCtrl.scrollView.__content; function rerender(value) { var beforeSiblings = []; @@ -226,6 +228,7 @@ function($collectionRepeatManager, $collectionDataSource, $parse) { if ( ionic.DomUtil.elementIsDescendant($element[0], node, scrollViewContent) ) { before = false; } else { + if (node.hasAttribute('collection-repeat-ignore')) return; var width = node.offsetWidth; var height = node.offsetHeight; if (width && height) { diff --git a/js/angular/directive/refresher.js b/js/angular/directive/refresher.js index 08d097916b4..b11c57da609 100644 --- a/js/angular/directive/refresher.js +++ b/js/angular/directive/refresher.js @@ -64,7 +64,7 @@ IonicModule replace: true, require: '^$ionicScroll', template: - '
' + + '
' + '
' + '
' + diff --git a/test/html/list-fit.html b/test/html/list-fit.html index 49f6b8f74fa..c686bb175ab 100644 --- a/test/html/list-fit.html +++ b/test/html/list-fit.html @@ -18,6 +18,7 @@

Hi

+

Hi, I'm some text before the list.

@@ -61,6 +62,7 @@

{{item.text}}

var n = 1 + Math.floor(4*Math.random()); for (var i = 0; i < n; i++) addImage(); $scope.$broadcast('scroll.infiniteScrollComplete'); + $scope.$broadcast('scroll.refreshComplete'); }, 1500); }; }