Skip to content
This repository was archived by the owner on Feb 2, 2023. It is now read-only.

Commit ff9e493

Browse files
george-gwAdlai Holler
authored andcommitted
Fixed asciiArtString. (#2523)
1 parent a6e2f8e commit ff9e493

4 files changed

Lines changed: 3 additions & 27 deletions

File tree

AsyncDisplayKit/Layout/ASAbsoluteLayoutSpec.mm

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -100,19 +100,6 @@ - (ASLayout *)calculateLayoutThatFits:(ASSizeRange)constrainedSize
100100

101101
@end
102102

103-
104-
#pragma mark - Debugging
105-
106-
@implementation ASAbsoluteLayoutSpec (Debugging)
107-
108-
- (NSString *)debugBoxString
109-
{
110-
return [ASLayoutSpec asciiArtStringForChildren:self.children parentName:[self asciiArtName]];
111-
}
112-
113-
@end
114-
115-
116103
#pragma mark - ASStaticLayoutSpec
117104

118105
@implementation ASStaticLayoutSpec : ASAbsoluteLayoutSpec

AsyncDisplayKit/Layout/ASLayoutSpec.mm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -345,7 +345,7 @@ + (NSString *)asciiArtStringForChildren:(NSArray *)children parentName:(NSString
345345

346346
- (NSString *)asciiArtString
347347
{
348-
NSArray *children = self.child ? @[self.child] : self.children;
348+
NSArray *children = self.children.count < 2 && self.child ? @[self.child] : self.children;
349349
return [ASLayoutSpec asciiArtStringForChildren:children parentName:[self asciiArtName]];
350350
}
351351

AsyncDisplayKit/Layout/ASOverlayLayoutSpec.mm

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -74,14 +74,3 @@ - (ASLayout *)calculateLayoutThatFits:(ASSizeRange)constrainedSize
7474
}
7575

7676
@end
77-
78-
@implementation ASOverlayLayoutSpec (Debugging)
79-
80-
#pragma mark - ASLayoutElementAsciiArtProtocol
81-
82-
- (NSString *)debugBoxString
83-
{
84-
return [ASLayoutSpec asciiArtStringForChildren:@[self.overlay, self.child] parentName:[self asciiArtName]];
85-
}
86-
87-
@end

AsyncDisplayKit/Private/ASLayoutTransition.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,12 +50,12 @@ NS_ASSUME_NONNULL_BEGIN
5050
previousLayout:(std::shared_ptr<ASDisplayNodeLayout>)previousLayout NS_DESIGNATED_INITIALIZER;
5151

5252
/**
53-
* Insert and remove subnodes that where added or removed between the previousLayout and the pendingLayout
53+
* Insert and remove subnodes that were added or removed between the previousLayout and the pendingLayout
5454
*/
5555
- (void)commitTransition;
5656

5757
/**
58-
* Insert all new subnodes that where added between the previous layout and the pending layout
58+
* Insert all new subnodes that were added between the previous layout and the pending layout
5959
*/
6060
- (void)applySubnodeInsertions;
6161

0 commit comments

Comments
 (0)