Merge pull request samvermette#100 from luosky/master

Prevent infiniteScrolling being triggered multiple times.
harleywang · Jan 16, 2013 · fcb4222 · fcb4222
2 parents 52431a4 + e2d210a
commit fcb4222
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/SVPullToRefresh/UIScrollView+SVInfiniteScrolling.m b/SVPullToRefresh/UIScrollView+SVInfiniteScrolling.m
@@ -196,9 +196,9 @@ - (void)scrollViewDidScroll:(CGPoint)contentOffset {
  CGFloat scrollViewContentHeight = self.scrollView.contentSize.height;
  CGFloat scrollOffsetThreshold = scrollViewContentHeight-self.scrollView.bounds.size.height;
 
- if(!self.scrollView.isDragging && self.state == SVInfiniteScrollingStateTriggered && !self.scrollView.isDragging)
+ if(!self.scrollView.isDragging && self.state == SVInfiniteScrollingStateTriggered)
  self.state = SVInfiniteScrollingStateLoading;
- else if(contentOffset.y > scrollOffsetThreshold && self.state == SVInfiniteScrollingStateStopped && self.scrollView.isDecelerating)
+ else if(contentOffset.y > scrollOffsetThreshold && self.state == SVInfiniteScrollingStateStopped && self.scrollView.isDragging)
  self.state = SVInfiniteScrollingStateTriggered;
  else if(contentOffset.y < scrollOffsetThreshold && self.state != SVInfiniteScrollingStateStopped)
  self.state = SVInfiniteScrollingStateStopped;