Skip to content
This repository was archived by the owner on Feb 2, 2023. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions AsyncDisplayKit/ASDisplayNode.h
Original file line number Diff line number Diff line change
Expand Up @@ -685,7 +685,6 @@ typedef NS_OPTIONS(NSUInteger, ASInterfaceState)
* @param node The node to be added.
*/
- (void)addSubnode:(ASDisplayNode *)node;
- (NSString *)name;
@end

/** CALayer(AsyncDisplayKit) defines convenience method for adding sub-ASDisplayNode to a CALayer. */
Expand All @@ -696,7 +695,6 @@ typedef NS_OPTIONS(NSUInteger, ASInterfaceState)
* @param node The node to be added.
*/
- (void)addSubnode:(ASDisplayNode *)node;
- (NSString *)name;
@end

@interface ASDisplayNode (Deprecated)
Expand Down
10 changes: 0 additions & 10 deletions AsyncDisplayKit/ASDisplayNode.mm
Original file line number Diff line number Diff line change
Expand Up @@ -2279,11 +2279,6 @@ - (void)addSubnode:(ASDisplayNode *)node
}
}

- (NSString *)name
{
return self.asyncdisplaykit_node.name;
}

@end

@implementation CALayer (AsyncDisplayKit)
Expand All @@ -2293,11 +2288,6 @@ - (void)addSubnode:(ASDisplayNode *)node
[self addSublayer:node.layer];
}

- (NSString *)name
{
return self.asyncdisplaykit_node.name;
}

@end


Expand Down
4 changes: 2 additions & 2 deletions AsyncDisplayKitTests/ASDisplayNodeTests.m
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,11 @@
}

static NSString *orderStringFromSublayers(CALayer *l) {
return [[l.sublayers valueForKey:@"name"] componentsJoinedByString:@","];
return [[[l.sublayers valueForKey:@"asyncdisplaykit_node"] valueForKey:@"name"] componentsJoinedByString:@","];
}

static NSString *orderStringFromSubviews(UIView *v) {
return [[v.subviews valueForKey:@"name"] componentsJoinedByString:@","];
return [[[v.subviews valueForKey:@"asyncdisplaykit_node"] valueForKey:@"name"] componentsJoinedByString:@","];
}

static NSString *orderStringFromSubnodes(ASDisplayNode *n) {
Expand Down