Commit Graph
4265 Commits
Author SHA1 Message Date
Adlai Holler 4bfdd82568 _ASHierarchyChangeSet: Exclude item-level changes that are redundant with section-level changes 2015-11-25 17:18:58 -08:00
Adlai Holler b5e19a24a9 Consistency 2015-11-24 18:48:07 -08:00
Adlai Holler 2d633f118b Fix it better 2015-11-24 18:44:10 -08:00
Adlai Holler 6b3f0ada12 Fix table view change coalescing bug 2015-11-24 18:10:59 -08:00
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
Huy Nguyen 0077c3eec6 Implement horizontal and vertical alignments for stack layout 2015-11-24 20:57:19 +02:00
Alexey Glushkov c501e46b5d removed wrong conditions in _needInvalidateRenderer 2015-11-24 11:35:20 +03:00
Alexey Glushkov 01a2fd90d4 removed displaySize method, added condition to skip _invalidateRendererIfNeeded if there are no view and no layer 2015-11-24 11:12:36 +03:00
Alexey Glushkov e859f9a870 fixed brace style 2015-11-24 10:10:34 +03:00
Alexey Glushkov 1d986f607b reverted Podfile.lock 2015-11-24 10:04:42 +03:00
Alexey Glushkov 38ded30da9 add layer backed text node support for the fix 2015-11-24 10:01:02 +03: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
Alexey Glushkov 42f56defbf ASTextNode wrong text layout fix 2015-11-22 11:56:12 +03: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
Huy Nguyen 52c45cf5e3 Trigger a relayout once the media image of PostNode in SocialAppLayout is loaded 2015-11-17 18:09:16 +02:00
Scott Goodson 97eaa15b04 Introduce ASInterfaceState on ASDisplayNode.
Later, this will be added to ASViewController.  Right now it is not hooked up to drive anything.
It will become the codepath that drives calls like -fetchData and -clearContents.
2015-11-16 11:36:10 -08:00
Huy Nguyen 1162e02b06 Implement "space between" and "space around" options of stack layout justify content 2015-11-16 19:34:08 +02:00
Aaron Schubert 863156b2dc Changed hasLiveMap to liveMap/isLiveMap. Removed internal action handler. Renamed ASDisplayNode liveMap to mapView to avoid naming confusion. 2015-11-16 13:48:21 +00:00
Huy Nguyen 390d16caef Quickly return min size if a stack has no children 2015-11-16 01:46:28 +02:00
aaronschubert0 f948792dff Merge pull request #1 from aaronschubert0/temp
Make MapKit a weak framework
2015-11-15 17:10:12 +00:00
Aaron Schubert 372acd85a4 Make MapKit a weak framework 2015-11-15 16:58:56 +00: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
Aaron Schubert 49c476bdd1 Move ASMapNode header into public 2015-11-12 15:05:45 +00:00
Aaron Schubert 156b5866a5 Add ASMapNode to main header file. 2015-11-12 14:57:09 +00:00
Aaron Schubert 607be19ce7 Update Podspec to require MapKit framework 2015-11-12 14:54:29 +00:00
Aaron Schubert 1b74f8d696 Update ReadMe to mention new MapKit link 2015-11-12 14:27:45 +00:00
Aaron Schubert b35a9bbbb6 Add MapKit to Life Without CocoaPods 2015-11-12 14:25:29 +00:00
Aaron Schubert 476bff2bf1 Link MapKit in static framework. 2015-11-12 14:09:48 +00:00