ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-12-22 14:20:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into update-objc

Browse Source 
Conflicts:
	AsyncDisplayKit/ASDisplayNode+Subclasses.h
	AsyncDisplayKit/ASMultiplexImageNode.h
	AsyncDisplayKit/ASViewController.h
	AsyncDisplayKit/Details/ASDataController.h
This commit is contained in:
Adlai Holler
2015-10-05 13:24:16 -07:00
parent 73af8f1c8b 2f1d57e50c
commit 8bb9d173dc
68 changed files with 2337 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
AsyncDisplayKit/ASEditableTextNode.h
View File

@@ -12,7 +12,10 @@ NS_ASSUME_NONNULL_BEGIN
@protocol ASEditableTextNodeDelegate;
/// @abstract ASEditableTextNode implements a node that supports text editing.
/**
@abstract Implements a node that supports text editing.
@discussion Does not support layer backing.
*/
@interface ASEditableTextNode : ASDisplayNode
// @abstract The text node's delegate, which must conform to the <ASEditableTextNodeDelegate> protocol.