Merge pull request jverkoey#281 from dataway/HEAD

[NIPagingScrollView] make moveToPageAtIndex not discard requested pageIndex
muhtasib · Sep 20, 2012 · 1b50f35 · 1b50f35
2 parents a24f72c + eec56ad
commit 1b50f35
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/src/pagingscrollview/src/NIPagingScrollView.m b/src/pagingscrollview/src/NIPagingScrollView.m
@@ -41,6 +41,7 @@ @interface NIPagingScrollView()  {
   BOOL _isModifyingContentOffset;
   BOOL _isAnimatingToPage;
   BOOL _isKillingAnimation;
+  NSInteger _animatingToPageIndex;
 }
 
 @property (nonatomic, retain) UIScrollView* pagingScrollView;
@@ -663,6 +664,10 @@ - (BOOL)hasPrevious {
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 - (void)didAnimateToPage:(NSNumber *)pageIndex {
   _isAnimatingToPage = NO;
+  if (_animatingToPageIndex != -1 && _animatingToPageIndex != [pageIndex integerValue]) {
+    [self moveToPageAtIndex:_animatingToPageIndex animated:YES];
+    return;
+  }
 
   // Reset the content offset once the animation completes, just to be sure that the
   // viewer sits on a page bounds even if we rotate the device while animating.
@@ -681,8 +686,10 @@ - (void)didAnimateToPage:(NSNumber *)pageIndex {
 - (BOOL)moveToPageAtIndex:(NSInteger)pageIndex animated:(BOOL)animated {
   if (_isAnimatingToPage) {
     // Don't allow re-entry for sliding animations.
+    _animatingToPageIndex = pageIndex;
     return NO;
   }
+  _animatingToPageIndex = -1;
 
   CGPoint offset = [self frameForPageAtIndex:pageIndex].origin;
   offset = [self adjustOffsetWithMargin:offset];