864 Commits

Author SHA1 Message Date
Adlai Holler
b16a9e294e Merge branch 'master' into update-objc
Conflicts:
	AsyncDisplayKit/ASDisplayNode+Subclasses.h
2015-12-06 12:25:13 -08:00
appleguy
29897297c5 Merge pull request #913 from Adlai-Holler/WorkaroundCellContentsLoading
Provide Basic Interface State Support for Nodes Outside of Cells
2015-12-05 17:35:28 -08:00
appleguy
faf9d266c5 Merge pull request #914 from Adlai-Holler/UpdateInterfaceStateBeforeCallout
Minimize critical section in -setInterfaceState:, and move ivar set before subclass hooks are called.
2015-12-05 16:03:57 -08:00
appleguy
6e13368463 Merge pull request #911 from Adlai-Holler/FixTextNodeHighlightingLogic
Reduce Reliance on -textNode:shouldHighlightLinkAttribute:value:atPoint:
2015-12-05 11:01:56 -08:00
Adlai Holler
4284b6e23a Set _interfaceState before calling fetchData et al. 2015-12-05 00:20:44 -08:00
Adlai Holler
0bfb5a0401 Make new interface state a first-class value 2015-12-04 12:49:38 -08:00
Adlai Holler
9579420cd7 Add static constant ASInterfaceStateInHierarchy which we'll return if the node is not in a cell but its view is in a window 2015-12-04 12:47:36 -08:00
appleguy
3a04cb7cc8 Merge pull request #898 from Adlai-Holler/OptimizeNodeDidRelayout
Reduce Frequency of beginUpdates/endUpdates Due to Node Relayout
2015-12-03 21:02:22 -08:00
Adlai Holler
835acd6a25 Change assumed value for text node highlighting delegate method to YES and don't consult it unless highlighting. 2015-12-03 20:52:02 -08:00
Adlai Holler
f39105a8f4 Optimize 2015-12-03 09:45:45 -08:00
Adlai Holler
f723452756 Allow link taps to continue if touches move within the same link 2015-12-03 09:25:37 -08:00
Adlai Holler
73b90023dc Merge branch 'master' into update-objc 2015-12-01 22:16:36 -08:00
Adlai Holler
1fd65c2f25 Annotate ASAsciiArtBoxCreator.h 2015-12-01 21:57:45 -08:00
appleguy
e42bcf47be Merge pull request #901 from Adlai-Holler/ModernizeCellLoading
ASTableView: Use Fancy dequeueReusableCellWithIdentifier:forIndexPath: Method
2015-12-01 17:54:45 -08:00
Scott Goodson
3b6b48175d Fix for an incorrect assertion firing when transforming an ASLayoutSpec-positioned node. 2015-12-01 17:49:11 -08:00
Adlai Holler
8e75c594c7 Add some more annotations 2015-12-01 16:48:55 -08:00
Adlai Holler
fdfe18873a Merge branch 'master' into update-objc
Conflicts:
	AsyncDisplayKit/ASDisplayNodeExtras.h
	AsyncDisplayKit/Details/ASTextNodeRenderer.h
	AsyncDisplayKit/Details/ASTextNodeShadower.h
2015-12-01 16:45:25 -08:00
Adlai Holler
e1d06e70ff Fix constant naming 2015-12-01 12:00:38 -08:00
Adlai Holler
ec682db8d7 Fix name 2015-11-30 23:24:57 -08:00
Adlai Holler
1f8df4ffec Use shiny new dequeueReusableCellWithIdentifier:forIndexPath: method in ASTableView 2015-11-30 23:22:53 -08:00
Adlai Holler
0ee1fd82dc Refactor nodeDidRelayoutWithSizeChange: -> nodeDidRelayout:sizeChanged: 2015-11-30 19:29:27 -08:00
Adlai Holler
04d93532bc Only require node sizes once per run loop, and only if a node's size has changed 2015-11-30 17:20:32 -08:00
Levi McCallum
04ad021daa Rename positioning block to sport as namespace 2015-11-30 06:55:32 -08:00
Levi McCallum
cd78bcce99 Convert naming of hash helpers to AS namespace 2015-11-30 06:53:50 -08:00
Levi McCallum
2cf4b22c96 Include correct TextKit headers 2015-11-30 06:46:53 -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
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
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
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
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
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
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