appleguy
f74eb4e800
Merge pull request #662 from adly-holler/indentation-settings
...
Update project indentation settings
2015-09-17 10:11:40 +02:00
appleguy
6282b8607b
Merge pull request #661 from nguyenhuy/DisableFailingTableViewTest
...
Disable an unstable test in ASTableViewTests.
2015-09-17 10:10:03 +02:00
Adlai Holler
b1dfaa1eff
Update project indentation settings
2015-09-16 14:17:52 -07:00
Huy Nguyen
dfbaa35706
Disable an unstable test in ASTableViewTests.
2015-09-16 23:04:18 +03:00
appleguy
f275d858ae
Merge pull request #632 from paulyoung/compiler-warnings
...
Add missing imports to address compiler warnings.
2015-09-16 21:48:33 +02: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
appleguy
6e04bfbb94
Merge pull request #657 from nguyenhuy/AppledocInASLayoutSpec
...
Fix appledoc warnings in ASLayoutSpec.h
2015-09-16 13:34:44 +02:00
Huy Nguyen
0c068c442d
Fix appledoc warnings in ASLayoutSpec.h
2015-09-16 14:30:37 +03:00
appleguy
c9aa2dec44
Merge pull request #656 from rcancro/ASLayoutOptionsPrivate
...
As layout options private
2015-09-16 13:18:09 +02: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
b0948ee6ae
Changed target membership of ASLayoutOptionsPrivate.h to Private from Public.
2015-09-15 17:18:08 -07:00
rcancro
21cc4e085c
Merge branch 'ASLayoutOptionsPrivate' of github.com:rcancro/AsyncDisplayKit into ASLayoutOptionsPrivate
2015-09-15 17:11:29 -07: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
eee60fb31b
Move ASLayoutOptionsPrivate to the private folder
...
fixes:
https://github.com/facebook/AsyncDisplayKit/issues/654
2015-09-15 17:10:55 -07:00
appleguy
fff8a0be4a
Merge pull request #653 from rcancro/documentation
...
Added missing Appledoc documentation
2015-09-15 21:50:43 +02: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
appleguy
a9f2bda345
Merge pull request #651 from rcancro/viewBlock
...
added a callback for initWithViewBlock/initWithLayerBlock
2015-09-15 18:50:24 +02: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
appleguy
6ce077be5a
Merge pull request #650 from nguyenhuy/appledoc
...
Fix appledoc warnings
2015-09-15 00:24:11 +02:00
Huy Nguyen
7dc9b7fc40
Fix appledoc warnings.
2015-09-15 00:58:48 +03:00
appleguy
83aac39ef2
Merge pull request #648 from rcancro/layoutOptionsComments
...
Addressed comments to LayoutOptions PR
2015-09-14 16:43:15 +02: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
appleguy
41197ad4a3
Merge pull request #646 from rcancro/finalLayoutableFollowup
...
Fixes a couple of comments
2015-09-10 18:16:24 -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
appleguy
a56ac35105
Merge pull request #613 from eanagel/ASDisplayNode-init-perf
...
ASDisplayNode: Perform one-time initializations in +initialize when possible
2015-09-09 22:36:19 -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
appleguy
69365451d1
Merge pull request #643 from nguyenhuy/fixRelayoutDuringInitialConfig
...
Avoid doing relayout during initial configuration
2015-09-09 19:45:21 -07:00
rcancro
23497379e4
added comment to give guidance if a user is getting crashing in finalLayoutable
2015-09-09 11:51:36 -07:00
rcancro
2a030c9841
First thoughts on fixing the finalLayoutable method.
2015-09-09 09:13:02 -07:00
appleguy
cb1081b759
Merge pull request #644 from rcancro/layoutOptions
...
Added ASLayoutOptions class to store all options for ASLayoutSpecs
2015-09-08 22:30:31 -07:00
Huy Nguyen
a8cecbd0ad
Avoid doing relayout during initial configuration of table and collection views.
2015-09-08 22:43:28 +03:00
Huy Nguyen
6383b69029
Update ASTableViewTests to detect the case when relayout is trigger during initial configuration.
2015-09-08 22:43:25 +03:00
rcancro
fc9d589cf9
Merge branch 'layoutOptions' of github.com:rcancro/AsyncDisplayKit into layoutOptions
2015-09-08 09:53:22 -07:00
rcancro
fe4a2d272f
add locks to ASLayoutOptions
2015-09-08 09:50:47 -07:00
rcancro
b3369ca388
making ASLayoutOptions threadsafe
2015-09-08 09:50:47 -07:00
rcancro
fca43a651f
Make layoutOptions readonly
2015-09-08 09:50:47 -07:00
rcancro
2a8b20b102
didn't mean to commit this
2015-09-08 09:50:47 -07:00
rcancro
5786bc1b5b
Fixed infinite recursion in finalLayoutable, removed child properties from ASLayoutSpecs
2015-09-08 09:50:47 -07:00
rcancro
84cd80c41d
bug in setting the ASLayoutOptions default class.
2015-09-08 09:50:47 -07:00
rcancro
36d00273fb
wasn't copying layout options to final layoutable.
2015-09-08 09:50:47 -07:00