Merge pull request #1072 from knopp/ASCollectionView-content-offset-975

appleguy · appleguy · commit 46bcc90185dc · 2016-01-18T21:24:04.000-08:00
[ASCollectionView] prevent data controller from removing/adding sections during reloadDataImmediately.
diff --git a/AsyncDisplayKit/ASCollectionView.mm b/AsyncDisplayKit/ASCollectionView.mm
@@ -252,6 +252,7 @@ - (void)reloadData
 - (void)reloadDataImmediately
 {
   ASDisplayNodeAssertMainThread();
+  _superIsPendingDataLoad = YES;
   [_dataController reloadDataImmediatelyWithAnimationOptions:kASCollectionViewAnimationNone];
   [super reloadData];
 }

Original file line number	Diff line number	Diff line change
`@@ -252,6 +252,7 @@ - (void)reloadData`
`252`	`252`	`- (void)reloadDataImmediately`
`253`	`253`	`{`
`254`	`254`	`ASDisplayNodeAssertMainThread();`
	`255`	`+ _superIsPendingDataLoad = YES;`
`255`	`256`	`[_dataController reloadDataImmediatelyWithAnimationOptions:kASCollectionViewAnimationNone];`
`256`	`257`	`[super reloadData];`
`257`	`258`	`}`