Commit Graph
5091 Commits
Author SHA1 Message Date
Levi McCallum 24cb1d5cb0 Fix broken build 2015-11-29 21:49:34 -08:00
appleguy d132416d90 Merge pull request #848 from nguyenhuy/JustifyContentSpaceBetweenAndAround
Implement "space between" and "space around" justify content options for stack layout
2015-11-29 21:46:42 -08:00
Levi McCallum c801965f94 Zero out constrained size value by default 2015-11-29 21:28:59 -08:00
Adlai Holler fca8614c18 Scope like a boss 2015-11-29 21:22:37 -08:00
appleguy ebf8da9b55 Merge pull request #894 from Adlai-Holler/InterfaceStateImageNode
Use ASInterfaceState to Fetch Image Node Data when Image Source Changes
2015-11-29 21:20:39 -08:00
Adlai Holler 50b318b117 Lock and unlock manually when doing early return 2015-11-29 17:49:11 -08:00
Adlai Holler e481782ccb ASMultiplexImageNode: only copy image identifiers once 2015-11-29 17:43:09 -08:00
Adlai Holler 7d3cf56b17 ASMultiplexImageNode: fix bad behaviors with imageIdentifiers property 2015-11-29 17:33:00 -08:00
Adlai Holler 46eca61dbf ASMultiplexImageNode: replace spin lock with mutex 2015-11-29 17:31:57 -08:00
Adlai Holler dfc7c0cc0e Image nodes call fetchData when image source is updated while in fetch range 2015-11-29 17:29:44 -08:00
appleguy ee7e311631 Merge pull request #850 from facebook/NodeLifecycle
Introduce ASInterfaceState on ASDisplayNode.
2015-11-29 16:57:02 -08:00
Scott Goodson 254f55b758 Add locking for ASInterfaceState. Misc. cleanup. 2015-11-29 14:57:43 -08:00
Levi McCallum 59ff876b67 Ensure that nil message doesn't cause invalid scalar value 2015-11-29 13:51:15 -08:00
Scott Goodson fb9f37b293 Merge remote-tracking branch 'origin/NodeLifecycle' into NodeLifecycle
Conflicts:
	AsyncDisplayKit/ASDisplayNode.h
	AsyncDisplayKit/ASDisplayNode.mm
2015-11-29 13:26:53 -08:00
Scott Goodson 936730d46b ASInterfaceStateVisible is now being driven by a new ASRangeHandlerVisible. 2015-11-29 13:24:42 -08:00
Scott Goodson 1ed22866b1 Working implementation of ASInterfaceState for Display and FetchData behaviors. 2015-11-28 22:48:30 -08:00
Scott Goodson 943cae7eb9 Placeholder implementation of -setInterfaceState:. 2015-11-28 18:22:03 -08:00
Scott Goodson ff0e94b4e1 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-28 18:22:03 -08:00
Scott Goodson d87404e4be Placeholder implementation of -setInterfaceState:. 2015-11-28 17:45:43 -08:00
appleguy bd4b8601ba Merge pull request #837 from levi/levi/cell-selection
Fix selection inconsistency in ASTableView/ASCollectionView cell implementation
2015-11-28 16:56:25 -08:00
appleguy 37334273dd Merge pull request #873 from nguyenhuy/AlignmentWrapper
[ASLayoutSpec] Implement horizontal and vertical alignments
2015-11-28 16:24:48 -08:00
appleguy 6ea01d66a4 Merge pull request #857 from nguyenhuy/ImproveSocialAppLayoutSample
Trigger a relayout once the media image of PostNode in SocialAppLayout is loaded
2015-11-28 16:01:14 -08:00
Levi McCallum 36d24950e0 Add custom collection view layout example project 2015-11-27 18:58:44 -08:00
appleguy c1539bda6e Merge pull request #884 from Adlai-Holler/FixTableViewUpdatingIssue
Fix Table View Updating Issues in #869 - typeahead including section and item adds / deletes
2015-11-26 14:41:49 -08:00
Adlai Holler d273cda2b0 Remove unneeded _block specifier 2015-11-26 10:46:26 -08:00
Adlai Holler 41ecaa7bb2 _ASHierarchyChangeSet: add section change mapping methods, fix section exclusions 2015-11-26 10:42:35 -08:00
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