Commit Graph
4957 Commits
Author SHA1 Message Date
Levi McCallum 52b6c47d23 Allow resizing TextKit tests to pass by taking into account imprecision 2015-11-30 06:46:53 -08:00
Levi McCallum 2cf4b22c96 Include correct TextKit headers 2015-11-30 06:46:53 -08:00
Levi McCallum 8114fc4f46 Bring over core TextKit Truncation and Renderer tests from CK 2015-11-30 06:46:52 -08:00
Levi McCallum c1f4456fd5 Use composed attributed truncation string for underlying drawing text 2015-11-30 06:44:53 -08:00
Levi McCallum a8e6aebe9c Remove public header exposure of text kit internals 2015-11-30 06:44:53 -08:00
Levi McCallum 197a31f636 Fix mistakenly renamed method in unit test 2015-11-30 06:44:53 -08:00
Levi McCallum 397e5b15e9 Fix tabbing on initializer 2015-11-30 06:44:53 -08:00
Levi McCallum a0c05ebffc Rename CK classes to AS classes 2015-11-30 06:44:53 -08:00
Levi McCallum de66819286 Implement functioning isTruncated API on ASTextNode 2015-11-30 06:41:41 -08:00
Levi McCallum 74435fb584 Convert ASTextNode to support CKTextKitRenderer 2015-11-30 06:41:41 -08:00
Levi McCallum 275fd3eddd Include missing hash helpers implementation 2015-11-30 06:41:40 -08:00
Levi McCallum bae3e3b63d Add latest ComponentKit text kit renderer into project 2015-11-30 06:41:40 -08:00
Scott Goodson 9032962353 Nuke the curly quotes - omg y must u curly 1.9.2 2015-11-29 22:39:59 -08:00
appleguy 937b72b64a Merge pull request #879 from levi/levi/custom-layout-example
Add custom collection view layout example project
2015-11-29 22:14:31 -08:00
appleguy 171160564a Merge pull request #895 from Adlai-Holler/Cleanup894
Cleanup PR 894
2015-11-29 22:01:04 -08:00
Scott Goodson df11ea8b34 Podspec 1.9.2 version bump. 2015-11-29 21:50:57 -08:00
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