ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-12-23 22:55:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Merge pull request #2649 from facebook/AHCollectionNodeInitializer"

Browse Source 
This reverts commit 0f620f458d, reversing
changes made to 0c65d21f8d.
This commit is contained in:
Adlai Holler
2016-11-23 15:56:24 -08:00
parent 0f620f458d
commit 14765a55d2
3 changed files with 15 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
AsyncDisplayKit/ASCollectionNode.mm
View File

@@ -111,22 +111,20 @@
- (instancetype)initWithCollectionViewLayout:(UICollectionViewLayout *)layout
{
return [self initWithCollectionViewLayout:layout layoutInspector:nil];
return [self initWithFrame:CGRectZero collectionViewLayout:layout];
}
- (instancetype)initWithCollectionViewLayout:(UICollectionViewLayout *)layout layoutInspector:(id<ASCollectionViewLayoutInspecting>)layoutInspector
- (instancetype)initWithFrame:(CGRect)frame collectionViewLayout:(UICollectionViewLayout *)layout
{
return [self initWithCollectionViewLayout:layout layoutInspector:layoutInspector layoutFacilitator:nil];
return [self initWithFrame:frame collectionViewLayout:layout layoutFacilitator:nil];
}
- (instancetype)initWithCollectionViewLayout:(UICollectionViewLayout *)layout layoutInspector:(id<ASCollectionViewLayoutInspecting>)layoutInspector layoutFacilitator:(id<ASCollectionViewLayoutFacilitatorProtocol>)layoutFacilitator
- (instancetype)initWithFrame:(CGRect)frame collectionViewLayout:(UICollectionViewLayout *)layout layoutFacilitator:(id<ASCollectionViewLayoutFacilitatorProtocol>)layoutFacilitator
{
__weak __typeof__(self) weakSelf = self;
ASDisplayNodeViewBlock collectionViewBlock = ^UIView *{
__typeof__(self) strongSelf = weakSelf;
ASCollectionView *collectionView = [[ASCollectionView alloc] _initWithFrame:CGRectZero collectionViewLayout:layout layoutFacilitator:layoutFacilitator eventLog:ASDisplayNodeGetEventLog(strongSelf)];
collectionView.layoutInspector = layoutInspector;
return collectionView;
return [[ASCollectionView alloc] _initWithFrame:frame collectionViewLayout:layout layoutFacilitator:layoutFacilitator eventLog:ASDisplayNodeGetEventLog(strongSelf)];
};
if (self = [super initWithViewBlock:collectionViewBlock]) {