Merge branch 'master' into pr/664

This commit is contained in:
Scott Goodson
2015-12-25 14:32:41 -08:00
48 changed files with 1223 additions and 647 deletions

View File

@@ -16,7 +16,11 @@ NS_ASSUME_NONNULL_BEGIN
*/
@interface ASCollectionNode : ASDisplayNode
- (instancetype)initWithCollectionViewLayout:(UICollectionViewLayout *)layout NS_DESIGNATED_INITIALIZER;
- (instancetype)initWithCollectionViewLayout:(UICollectionViewLayout *)layout;
- (instancetype)initWithFrame:(CGRect)frame collectionViewLayout:(UICollectionViewLayout *)layout;
@property (weak, nonatomic) id <ASCollectionDelegate> delegate;
@property (weak, nonatomic) id <ASCollectionDataSource> dataSource;
@property (nonatomic, readonly) ASCollectionView *view;