Merge pull request #37 from qpwang/master

Prevent infiniteScroll conflict
m1entus · Mar 31, 2015 · 80e4151 · 80e4151
2 parents 4aaf39a + a20351b
commit 80e4151
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/INSPullToRefresh/INSInfiniteScrollBackgroundView.m b/INSPullToRefresh/INSInfiniteScrollBackgroundView.m
@@ -102,7 +102,9 @@ - (void)scrollViewDidScroll:(CGPoint)contentOffset {
 
     // The lower bound when infinite scroll should kick in
     CGFloat actionOffset = contentHeight - self.scrollView.bounds.size.height + self.scrollView.contentInset.bottom - self.additionalBottomOffsetForInfinityScrollTrigger;
-
+    // Prevent conflict with pull to refresh when tableView is too short
+    actionOffset = fmaxf(actionOffset, self.additionalBottomOffsetForInfinityScrollTrigger);
+
     // Disable infinite scroll when scroll view is empty
     // Default UITableView reports height = 1 on empty tables
     BOOL hasActualContent = (self.scrollView.contentSize.height > 1);