From 12e2b535dbe1fdded3b799fa90d9ba86a6679dea Mon Sep 17 00:00:00 2001 From: Michael Schneider Date: Tue, 2 Feb 2016 08:30:52 -0800 Subject: [PATCH] Use instance variable for tracking if a target was added to ASControlNode --- AsyncDisplayKit/ASControlNode+Subclasses.h | 6 ------ AsyncDisplayKit/ASControlNode.m | 7 +++---- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/AsyncDisplayKit/ASControlNode+Subclasses.h b/AsyncDisplayKit/ASControlNode+Subclasses.h index 9257911150..107de031e0 100644 --- a/AsyncDisplayKit/ASControlNode+Subclasses.h +++ b/AsyncDisplayKit/ASControlNode+Subclasses.h @@ -19,12 +19,6 @@ NS_ASSUME_NONNULL_BEGIN @interface ASControlNode (Subclassing) -/** - @abstract Indicates whether or not at least one target was added to the receiver - @discussion YES if the receiver has at least one target; NO otherwise. - */ -@property (nonatomic, readonly, assign, getter=isTargetAdded) BOOL targetAdded; - /** @abstract Sends action messages for the given control events. @param controlEvents A bitmask whose set flags specify the control events for which action messages are sent. See "Control Events" in ASControlNode.h for bitmask constants. diff --git a/AsyncDisplayKit/ASControlNode.m b/AsyncDisplayKit/ASControlNode.m index fa6c6f3914..3ccb2ef7bd 100644 --- a/AsyncDisplayKit/ASControlNode.m +++ b/AsyncDisplayKit/ASControlNode.m @@ -48,7 +48,6 @@ } // Read-write overrides. -@property (nonatomic, readwrite, assign, getter=isTargetAdded) BOOL targetAdded; @property (nonatomic, readwrite, assign, getter=isTracking) BOOL tracking; @property (nonatomic, readwrite, assign, getter=isTouchInside) BOOL touchInside; @@ -89,14 +88,14 @@ void _ASEnumerateControlEventsIncludedInMaskWithBlock(ASControlNodeEvent mask, v [super didLoad]; // As we have no targets yet, we start off with user interaction off. When a target is added, it'll get turned back on. - if (!self.targetAdded) { + if (!_targetAdded) { self.userInteractionEnabled = NO; } } - (BOOL)shouldTrackTouches { - return self.isTargetAdded && self.enabled; + return _targetAdded && self.enabled; } - (void)touchesBegan:(NSSet *)touches withEvent:(UIEvent *)event @@ -270,7 +269,7 @@ void _ASEnumerateControlEventsIncludedInMaskWithBlock(ASControlNodeEvent mask, v [targetActions addObject:NSStringFromSelector(action)]; }); - self.targetAdded = YES; + _targetAdded = YES; self.userInteractionEnabled = YES; }