Merge branch 'master' into releases/p6.10

AsyncDisplayKit/ASDisplayNode.mm

@@ -893,8 +893,14 @@ static ASDisplayNodeMethodOverrides GetASDisplayNodeMethodOverrides(Class c)
  */
 - (void)animateLayoutTransition:(id<ASContextTransitioning>)context
 {
+  if ([context isAnimated] == NO) {
+    [self __layoutSublayouts];
+    [context completeTransition:YES];
+    return;
+  }
+ 
   ASDisplayNode *node = self;
-
+  
   NSAssert(node.isNodeLoaded == YES, @"Invalid node state");
   NSAssert([context isAnimated] == YES, @"Can't animate a non-animatable context");
   

AsyncDisplayKit/ASPagerNode.m

@@ -63,7 +63,8 @@
   [super didLoad];
   
   ASCollectionView *cv = self.view;
-  cv.asyncDelegate = self;
+  cv.asyncDataSource = _proxyDataSource ?: self;
+  cv.asyncDelegate = _proxyDelegate ?: self;
 #if TARGET_OS_IOS
   cv.pagingEnabled = YES;
   cv.scrollsToTop = NO;

AsyncDisplayKit/Details/ASDelegateProxy.m

@@ -91,8 +91,7 @@
           selector == @selector(collectionView:nodeForItemAtIndexPath:) ||
           selector == @selector(collectionView:nodeBlockForItemAtIndexPath:) ||
           selector == @selector(collectionView:numberOfItemsInSection:) ||
-          selector == @selector(collectionView:constrainedSizeForNodeAtIndexPath:) ||
-          selector == @selector(scrollViewWillEndDragging:withVelocity:targetContentOffset:)
+          selector == @selector(collectionView:constrainedSizeForNodeAtIndexPath:)
           );
 }