Skip to content

Commit 86565e2

Browse files
committed
fix(infiniteScroll): prevent error on infinite scroll complete with native scrolling Closes #3682
1 parent adea328 commit 86565e2

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

Diff for: js/angular/controller/infiniteScrollController.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,8 @@ function($scope, $attrs, $element, $timeout) {
4545
$timeout(function() {
4646
if (self.jsScrolling) self.scrollView.resize();
4747
// only check bounds again immediately if the page isn't cached (scroll el has height)
48-
if (self.scrollView.__container && self.scrollView.__container.offsetHeight > 0) {
48+
if ((self.jsScrolling && self.scrollView.__container && self.scrollView.__container.offsetHeight > 0) ||
49+
!self.jsScrolling) {
4950
self.checkBounds();
5051
}
5152
}, 30, false);

0 commit comments

Comments
 (0)