Merge branch 'master' into update-objc

Conflicts:
	AsyncDisplayKit/ASCellNode.h
This commit is contained in:
Adlai Holler
2015-11-02 09:36:46 -08:00
39 changed files with 592 additions and 206 deletions

View File

@@ -215,18 +215,6 @@ NS_ASSUME_NONNULL_BEGIN
*/
- (void)reloadRowsAtIndexPaths:(NSArray<NSIndexPath *> *)indexPaths withRowAnimation:(UITableViewRowAnimation)animation;
/**
* Relayouts the specified row using a given animation effect.
*
* @param indexPath The index path identifying the row to relayout.
*
* @param animation A constant that indicates how the relayout is to be animated. See UITableViewRowAnimation.
*
* @discussion This method must be called from the main thread. The relayout is excuted on main thread.
* The node of the specified row must be updated to cause layout changes before this method is called.
*/
- (void)relayoutRowAtIndexPath:(NSIndexPath *)indexPath withRowAnimation:(UITableViewRowAnimation)animation;
/**
* Moves the row at a specified location to a destination location.
*
@@ -255,7 +243,7 @@ NS_ASSUME_NONNULL_BEGIN
*
* @returns an indexPath for this cellNode
*/
- (NSIndexPath *)indexPathForNode:(ASCellNode *)cellNode;
- (nullable NSIndexPath *)indexPathForNode:(ASCellNode *)cellNode;
/**
* Similar to -visibleCells.