diff --git a/AsyncDisplayKit/ASEditableTextNode.h b/AsyncDisplayKit/ASEditableTextNode.h index c2b2060cdf..05c2bea790 100644 --- a/AsyncDisplayKit/ASEditableTextNode.h +++ b/AsyncDisplayKit/ASEditableTextNode.h @@ -23,7 +23,7 @@ @abstract Access to underlying UITextView for more configuration options. @warning This property should only be used on the main thread and should not be accessed before the editable text node's view is created. */ -@property (nonatomic, readwrite, strong) UITextView *textView; +@property (nonatomic, readonly, strong) UITextView *textView; //! @abstract The attributes to apply to new text being entered by the user. @property (nonatomic, readwrite, strong) NSDictionary *typingAttributes; diff --git a/AsyncDisplayKit/ASEditableTextNode.mm b/AsyncDisplayKit/ASEditableTextNode.mm index bc1687afdf..31b63fba91 100644 --- a/AsyncDisplayKit/ASEditableTextNode.mm +++ b/AsyncDisplayKit/ASEditableTextNode.mm @@ -41,7 +41,6 @@ { @private // Configuration. - UITextView *_textView; NSDictionary *_typingAttributes; // Core. @@ -78,7 +77,6 @@ _textKitComponents = [ASTextKitComponents componentsWithAttributedSeedString:nil textContainerSize:CGSizeZero]; _textKitComponents.layoutManager.delegate = self; _wordKerner = [[ASTextNodeWordKerner alloc] init]; - _textView = [[_ASDisabledPanUITextView alloc] initWithFrame:CGRectZero textContainer:_textKitComponents.textContainer]; // Create the placeholder scaffolding. _placeholderTextKitComponents = [ASTextKitComponents componentsWithAttributedSeedString:nil textContainerSize:CGSizeZero]; @@ -135,7 +133,7 @@ [self.view addSubview:_placeholderTextKitComponents.textView]; // Create and configure our text view. - _textKitComponents.textView = _textView; + _textKitComponents.textView = self.textView; //_textKitComponents.textView = NO; // Unfortunately there's a bug here with iOS 7 DP5 that causes the text-view to only be one line high when scrollEnabled is NO. rdar://14729288 _textKitComponents.textView.delegate = self; _textKitComponents.textView.editable = YES; @@ -190,25 +188,15 @@ #pragma mark - Configuration @synthesize delegate = _delegate; -#pragma mark - -@dynamic textView; - - (UITextView *)textView { ASDisplayNodeAssertMainThread(); - if (!_textView) { - _textView = [[_ASDisabledPanUITextView alloc] initWithFrame:CGRectZero textContainer:_textKitComponents.textContainer]; + if (!_textKitComponents.textView) { + _textKitComponents.textView = [[_ASDisabledPanUITextView alloc] initWithFrame:CGRectZero textContainer:_textKitComponents.textContainer]; } - return _textView; + return _textKitComponents.textView; } -- (void)setTextView:(UITextView *)textView -{ - ASDisplayNodeAssertMainThread(); - _textView = textView; -} - - #pragma mark - @dynamic typingAttributes;