Adlai Holler
628bb7eb3a
Revert minor deletion
2015-11-24 16:43:40 -08:00
Adlai Holler
dfc098fc20
Merge branch 'master' into update-objc
...
Conflicts:
AsyncDisplayKit/ASCollectionView.h
AsyncDisplayKit/ASTableView.h
AsyncDisplayKit/Details/ASLayoutController.h
AsyncDisplayKit/Details/ASRangeController.h
2015-11-24 16:40:03 -08:00
appleguy
50a52e7112
Merge pull request #878 from Adlai-Holler/ImageIdentifierEquality
...
Use ASObjectIsEqual When Comparing Identifiers in ASMultiplexImageNode
2015-11-23 21:27:05 -08:00
appleguy
15f718ddc9
Merge pull request #868 from levi/levi/remove-deprecated
...
Clean up syntax and organization of ASRangeController
2015-11-23 21:24:58 -08:00
Adlai Holler
97e42da172
Merge branch 'master' into ImageIdentifierEquality
...
Conflicts:
AsyncDisplayKit/ASMultiplexImageNode.mm
2015-11-23 18:36:02 -08:00
appleguy
5922c6b2c6
Merge pull request #881 from Adlai-Holler/KeepFetchingImages
...
[Critical] Don't Cancel Image Downloads in ASMultiplexImageNode.clearContents
2015-11-23 18:25:56 -08:00
Adlai Holler
1ff0d7f648
Intentionally don't cancel image downloads in ASMultiplexImageNode.clearContents
2015-11-23 15:24:11 -08:00
Adlai Holler
2771ce875e
Everyone gets an ASObjectIsEqual!!
2015-11-23 13:08:56 -08:00
Adlai Holler
93e5f905e8
Always use _setDownloadIdentifier:
2015-11-23 13:04:43 -08:00
Adlai Holler
7449809743
ASMultiplexImageNode: Use ASObjectIsEqual when comparing identifiers.
2015-11-23 13:00:35 -08:00
Levi McCallum
c6d4ed0dc3
Update documentation on the ASRangeController layoutController property
2015-11-19 18:26:50 -08:00
appleguy
e16d32bb60
Merge pull request #870 from facebook/clearContentsNodeLoading
...
Fix an issue that could cause the view / layer to be created early by -clearContents.
2015-11-19 17:42:38 -08:00
Scott Goodson
18dffb41e8
Fix an issue that could cause the view / layer to be created early by -clearContents.
2015-11-19 17:10:06 -08:00
Levi McCallum
e05c4b7419
Separate range controller delegate methods into separate data source
2015-11-19 16:01:38 -08:00
Levi McCallum
09a2e086b0
Clean up syntax and method ordering in ASRangeController
2015-11-19 14:03:53 -08:00
Levi McCallum
e9a32bfd3c
Remove deprecated layout controller methods
2015-11-19 11:48:06 -08:00
Adlai Holler
ecaabc8435
Merge branch 'master' into update-objc
...
Conflicts:
AsyncDisplayKit/Details/UIView+ASConvenience.h
2015-11-18 14:17:09 -08:00
appleguy
59d52ced3f
Merge pull request #847 from facebook/CollectionAndTableNodes
...
Substantially improve behavior of nested Table & Collection Nodes
2015-11-14 16:34:12 -08:00
Scott Goodson
2a0b9c8e14
Substantially improve behavior of nested Table & Collection Nodes
...
This ensures memory cleanup happens correctly and introduces a new test project
to support developing new features while stressing tough use cases for correctness.
2015-11-14 15:25:35 -08:00
appleguy
a24cfe691a
Merge pull request #846 from RuiAAPeres/exposeASTableNode
...
ASTableNode wasn't exposed publicly.
2015-11-14 13:53:24 -08:00
Rui Peres
377c84abc2
Imported missing classes in the umbrella header
2015-11-14 15:07:35 +00:00
Rui Peres
d5fe826ac4
ASTableNode wasn't exposed publicly. (carthage wouldn't be able to detect it)
2015-11-14 14:47:06 +00:00
Adlai Holler
ab326fc683
touchesCancelled:withEvent: has a nullable touches argument in UIKit for some reason
2015-11-13 12:17:17 -08:00
Adlai Holler
7922895b60
(Re?)add type annotations on touchesBegan:withEvent: et al
2015-11-13 12:11:24 -08:00
Adlai Holler
762be97a51
Merge branch 'master' into update-objc
2015-11-13 12:03:30 -08:00
Adlai Holler
057e98380e
Add NSObjectProtocol requirement to ASImageIdentifier
2015-11-13 12:02:09 -08:00
appleguy
5b1e2145cc
Merge pull request #832 from facebook/WindowTeardownCrash
...
Fix for behavior difference between CA and UIKit that causes mutation crash.
2015-11-09 13:43:28 -08:00
Scott Goodson
bfe908bc8a
Fix for behavior difference between CA and UIKit that causes mutation crash
2015-11-09 13:41:25 -08:00
Adlai Holler
bfe3040f57
Update nullability in ASCellNode.h
2015-11-09 10:10:37 -08:00
Scott Goodson
8b465c5bb1
Bump pod version
2015-11-08 20:45:55 -08:00
appleguy
3d6ba66c35
Merge pull request #831 from facebook/ASCIICrash
...
Fix crash in ASCII art creator for one-element children arrays.
2015-11-08 19:18:12 -08:00
Scott Goodson
6d8bad13c0
Fix crash in ASCII art creator for one-element children arrays
2015-11-08 19:04:16 -08:00
appleguy
e8d238610f
Merge pull request #830 from facebook/WorkingWindowQuickFix
...
Patch for properly tearing down Working Window
2015-11-08 18:54:34 -08:00
appleguy
b295eda4b1
Merge pull request #823 from vitalybaev/SocialAppExample
...
New example app -- a "social" feed similar to Facebook or Twitter
2015-11-08 18:53:22 -08:00
appleguy
7c9698a833
Merge pull request #812 from nguyenhuy/ImproveCellNodeLayoutDelegate
...
Improve cell node layout delegate
2015-11-08 18:29:35 -08:00
Scott Goodson
40237a52fc
Patch for properly tearing down Working Window
2015-11-08 18:24:58 -08:00
Adlai Holler
802011ef97
Merge branch 'master' into update-objc
...
Conflicts:
AsyncDisplayKit/ASDisplayNode.h
2015-11-08 18:19:06 -08:00
appleguy
b7c54718ae
Merge pull request #826 from facebook/layerWorkingRangeFix
...
Fix unusual cell content blanking issue when making existing cells much taller.
2015-11-08 10:27:38 -08:00
Scott Goodson
98010c4e16
Include moved UIResponder methods in UIViewBridging Category Implementation.
2015-11-08 00:12:13 -08:00
Scott Goodson
3a4e9902e2
Remove a change that leaked from another diff in progress.
2015-11-07 23:35:58 -08:00
Scott Goodson
efa47d65dd
Re-add name method to fix tests (grr). Clean up positioning of responder methods in header.
2015-11-07 23:29:36 -08:00
Scott Goodson
e0f40d5644
Fix unusual cell content blanking issue when making existing cells much taller.
2015-11-07 23:08:53 -08:00
appleguy
ec7aa1c3aa
Merge pull request #818 from steveram/table-node
...
Modify ASTableNode initializer
2015-11-07 15:34:14 -08:00
Vitaly Baev
d143aba6c2
changed deployment target and device family in SocialApp example
2015-11-06 19:38:30 +03:00
Vitaly Baev
318bb0342a
fix Travis-CI build for SocialApp example
2015-11-06 19:02:09 +03:00
Vitaly Baev
19c2e8b2e3
Fixed copyright in SocialApp example
2015-11-06 17:11:39 +03:00
Vitaly Baev
78293ad785
Added example of typical social app layout example
2015-11-06 17:09:11 +03:00
Vitaly Baev
b1784bcf9b
Fix ASTableViewCell's node selected/highlighted property
2015-11-06 13:46:30 +03:00
Steven Ramkumar
a621e10a93
Modify ASTableNode initializer
2015-11-05 08:59:41 -08:00
appleguy
fd24314c69
Merge pull request #801 from facebook/RangeTeardown
...
Add "Push Another Copy" to ASViewController demo for memory testing.
2015-11-04 23:06:03 -08:00
