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

Merge branch 'master' into update-objc

Browse Source 
Conflicts:
	AsyncDisplayKit/Private/ASDisplayNode+FrameworkPrivate.h
This commit is contained in:
Adlai Holler
2015-12-22 00:28:21 -05:00
parent e202b18db9 d7492b331f
commit 69767d558e
103 changed files with 2968 additions and 204 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
AsyncDisplayKit/ASCellNode.h
View File

@@ -95,6 +95,18 @@ typedef NSUInteger ASCellNodeAnimation;
*/
- (void)setNeedsLayout;
/**
* @abstract Initializes a cell with a given viewControllerBlock.
*
* @param viewBlock The block that will be used to create the backing view.
* @param didLoadBlock The block that will be called after the view created by the viewBlock is loaded
*
* @return An ASCellNode created using the root view of the view controller provided by the viewControllerBlock.
* The view controller's root view is resized to match the calcuated size produced during layout.
*
*/
- (instancetype)initWithViewControllerBlock:(ASDisplayNodeViewControllerBlock)viewControllerBlock didLoadBlock:(ASDisplayNodeDidLoadBlock)didLoadBlock;
@end