2133 Commits

Author SHA1 Message Date
Adlai Holler
7cd79e6e6f Tweak comment 2015-09-19 13:43:18 -07:00
Adlai Holler
f0f26d3dab Tweak the new pendingReload flag 2015-09-19 13:40:41 -07:00
Adlai Holler
77490e11c0 ASCollectionView: Suspend updates while reload data is pending 2015-09-19 13:35:57 -07:00
Adlai Holler
37e2a530ad Merge branch 'master' into update-objc 2015-09-19 12:53:06 -07:00
Adlai Holler
d0f4bacc67 ImageNode: fill background more efficiently 2015-09-19 12:23:51 -07:00
Scott Goodson
a8924a2977 Fix building test / profile under Xcode 7
It is strictly enforcing this unused variable (when asserts are compiled out).
2015-09-19 20:55:40 +02:00
Adlai Holler
f37a88d2e4 Give a prefix to make ASImageIdentifier typealias 2015-09-18 23:32:52 -07:00
Adlai Holler
c872485459 Fill image context with background color if image node is opaque 2015-09-17 21:59:52 -07:00
Adlai Holler
f20a0d4bc0 Add some nullables in ASTextNode 2015-09-17 19:56:21 -07:00
Adlai Holler
fd3a90a3ed Make image download token optional 2015-09-17 14:56:39 -07:00
Adlai Holler
ba9a742999 Fix nullability of ASImageDownloaderProtocol to conform to ASBasicImageDownloader behavior 2015-09-17 14:48:51 -07:00
Adlai Holler
38706d0962 Fix nullability in ASImageDownloaderProtocol completion handler 2015-09-17 14:22:29 -07:00
Adlai Holler
c010ddad3b Update all the files in the Details group 2015-09-17 13:30:28 -07:00
Adlai Holler
03648d12a8 Clarify ASCellNode docs that it is for use with collection view as well 2015-09-17 12:30:31 -07:00
Adlai Holler
309ecca444 In ASLayoutOptions, make initWithLayoutable: take a nullable argument 2015-09-17 11:42:38 -07:00
Adlai Holler
717df1cfd2 Merge latest master and update Layout headers 2015-09-17 11:39:59 -07:00
Adlai Holler
cde790124d Merge branch 'master' into update-objc 2015-09-17 11:27:27 -07:00
Huy Nguyen
a864341710 Remove nonnull and nuulable annotations in ASViewController. Travis don't recognize them (yet). 2015-09-17 16:07:43 +03:00
Huy Nguyen
fcd76dbd19 Use nonnull annotation, instead of sanity check, for node property in ASViewController. 2015-09-17 15:59:37 +03:00
Huy Nguyen
72d108cd98 Minor fixes in ASViewController and Multiplex sample. 2015-09-17 15:58:21 +03:00
Huy Nguyen
07c0d78c71 Add ASViewController and update Multiplex sample to use it. 2015-09-17 15:58:21 +03:00
appleguy
21bdbbe12f Merge pull request #665 from jflinter/jack-build-phase-cleanup
Clean up Cocoa Touch framework target
2015-09-17 10:15:21 +02:00
Jack Flintermann
ce33149548 make additional private headers actually private; import all public headers in AsyncDisplayKit.h 2015-09-16 23:31:48 -04:00
Jack Flintermann
ff1be72e04 add module.modulemap 2015-09-16 20:15:48 -04:00
Adlai Holler
e4dc823c0d hitTest:withEvent: return value should be nullable 2015-09-16 16:21:07 -07:00
Adlai Holler
a7240bac27 More objective-C cleanup 2015-09-16 15:41:56 -07:00
Adlai Holler
30ed0bd64a Restore old ASCollectionNode init 2015-09-16 15:39:06 -07:00
Adlai Holler
262d65eea9 More updates 2015-09-16 15:34:24 -07:00
Adlai Holler
814f72535c Add nullability annotations for public API 2015-09-16 15:21:35 -07:00
rcancro
7e3a0b3223 Changed copyIntoOptions to copyFromOptions
I thought I already did this. I think copyFrom is a better name.
2015-09-16 14:33:54 -07:00
Paul Young
77d74e60f0 Update header imports. 2015-09-16 12:17:01 -07:00
Paul Young
77dfd222d3 Merge branch 'master' into compiler-warnings 2015-09-16 12:13:50 -07:00
Paul Young
8426ab1122 Use a shared header for the static library and dynamic framework. 2015-09-16 12:12:21 -07:00
appleguy
b557075371 Merge pull request #655 from nguyenhuy/relayout_editing_mode
Relayout table view cell nodes if there is a mismatch between content view size and the node's constrained size
2015-09-16 15:20:48 +02:00
Huy Nguyen
094d2570f5 Force the layout of subviews when _ASTableViewCell transitioned to another state
Relayout will be triggered in layoutSubviews (if needed).
2015-09-16 15:25:40 +03:00
Huy Nguyen
0c068c442d Fix appledoc warnings in ASLayoutSpec.h 2015-09-16 14:30:37 +03:00
Huy Nguyen
2d575fcafc Relayout table view cell nodes if there is a mismatch between content view size and the node's constrained size
- Above is the generic case. Correctly handling it means relayout when the table view enters or leaves editing mode is solved as well.
- Async data source API removal: In a table view, cell nodes should always fill its content view and table view widths. Thus async data source can no longer provide custom constrained size for cell nodes. This removal allows table view to better handle relayout.
- Some more tests are added to ASTableViewTests to check against use cases handled in this diff.
2015-09-16 11:41:34 +03:00
rcancro
9c8aaeb17e Move ASLayoutOptionsPrivate to the private folder
fixes:
https://github.com/facebook/AsyncDisplayKit/issues/654
2015-09-15 17:11:20 -07:00
rcancro
3b4055fcd3 few more doc changes. 2015-09-15 12:38:41 -07:00
rcancro
2d30a81a75 added documentation 2015-09-15 11:05:30 -07:00
rcancro
2f3562fa09 scott's comments 2015-09-15 09:11:19 -07:00
rcancro
01be5acece added a callback for initWithViewBlock/initWithLayerBlock 2015-09-14 20:36:08 -07:00
Huy Nguyen
7dc9b7fc40 Fix appledoc warnings. 2015-09-15 00:58:48 +03:00
rcancro
2e3d59a73e spelling 2015-09-11 16:13:18 -07:00
rcancro
b14e189bfb Addressed comments to LayoutOptions PR 2015-09-11 16:07:18 -07:00
appleguy
dc0d22dff4 Merge pull request #647 from rcancro/stackBaseLine
Removed ASBaselineLayoutSpec and made baseline alignment part of ASStackLayoutSpec
2015-09-10 18:16:37 -07:00
rcancro
4bb8472182 Removed ASBaselineLayoutSpec and made baseline alignment part of ASStackView 2015-09-10 17:29:39 -07:00
rcancro
b85316d8bc a couple comment updates 2015-09-10 13:19:13 -07:00
Ethan Nagel
8ea40a0265 Merge branch 'master' into ASDisplayNode-init-perf
Conflicts:
	AsyncDisplayKit/ASDisplayNode.mm
	AsyncDisplayKit/Private/ASDisplayNodeInternal.h
2015-09-09 22:17:49 -07:00
appleguy
c959adace0 Merge pull request #645 from rcancro/finalLayoutableFlag
First thoughts on fixing the finalLayoutable method.
2015-09-09 21:36:58 -07:00