17 Commits
Author SHA1 Message Date
Scott Goodson 7dff6ffa14 Re-enable program flow instrumentation for Coveralls. More null-specifiers.
This does cause tests to crash at the end, which unfortunately seems like a known Xcode 7 bug.
2015-12-25 22:13:35 -08:00
Adlai Holler b4b88da8cd Merge branch 'master' into update-objc
Conflicts:
	AsyncDisplayKit/ASCellNode.h
2015-11-02 09:36:46 -08:00
Samuel Hsiung e4d2551384 Make textContainerInset configurable for ASEditableTextNode placeholder and typed textViews
Previously, it was only possible to configure the textContainerInset of the typed textView by accessing the textView property on didLoad. This would cause the placeholder and typed textViews to become desynced however, so in this commit we add the ability to configure both.
2015-10-31 16:37:04 -07:00
Adlai Holler 8bb9d173dc Merge branch 'master' into update-objc
Conflicts:
	AsyncDisplayKit/ASDisplayNode+Subclasses.h
	AsyncDisplayKit/ASMultiplexImageNode.h
	AsyncDisplayKit/ASViewController.h
	AsyncDisplayKit/Details/ASDataController.h
2015-10-05 13:24:16 -07:00
Adlai Holler 20c74229a9 Updates from PR 2015-09-22 13:16:59 -07:00
Adlai Holler a1ffa499cb Assert against the user trying to set isLayerBacked on ASEditableTextNode 2015-09-21 00:15:03 -07:00
Adlai Holler a7240bac27 More objective-C cleanup 2015-09-16 15:41:56 -07:00
Adlai Holler 814f72535c Add nullability annotations for public API 2015-09-16 15:21:35 -07:00
appleguy 16ed66c3a1 Merge pull request #550 from marmelroy/issue-549
Access to underlying UITextView for more configuration options.
2015-07-30 22:04:30 -07:00
Connor Montgomery ca5e9e7dc3 Add support for configuring on ASEditableTextNode. 2015-07-30 15:19:00 -04:00
Roy Marmelstein 6b38000941 A simpler, cleaner implementation 2015-07-22 11:05:27 +02:00
Roy Marmelstein fd3eb94fcb Add main thread warnings and setter/getter assert 2015-07-12 21:35:42 +02:00
Huy Nguyen cfac6c992a [appledoc] Fix appledoc warnings. (#553) 2015-07-10 19:02:04 +07:00
Roy Marmelstein 95016021b4 Access to underlying UITextView for more configuration options. 2015-07-09 16:09:20 +02:00
Jack Flintermann 8a200078bd make ASEditableTextField properly subclass responder methods 2015-06-27 03:19:51 -04:00
Ryan Nystrom ad474fce8e Make project imports consistent 2015-02-23 14:55:15 -08:00
Nadine Salter 795b297c38 ASEditableTextNode. 2015-01-23 15:02:16 -08:00