Commit Graph

3401 Commits

Author SHA1 Message Date
ricky
501fed16aa nil out displayContext when we get a new one
Summary: Don't set the new one in the subnodes yet as this will cause ASEnvironmentTraitCollectionIsEqualToASEnvironmentTraitCollection to return NO if only the displayContext changed.

Reviewers: garrett, levi, rmalik

Reviewed By: garrett, levi, rmalik

Subscribers: rmalik

Differential Revision: https://phabricator.pinadmin.com/D94320
2016-06-02 10:33:32 -07:00
appleguy
86deec4033 Merge pull request #1665 from hannahmbanana/master
[AsyncDisplayKit+Debug.h] Move hitTestDebug code out of ASControlNode and into debug file
2016-06-01 11:15:44 +07:00
appleguy
2358c54d7f Merge pull request #1700 from 1nput0utput/ASPINRemoteImageDownloaderChanllengeBlock
[ASPINRemoteImageDownloader] Allows setting authentication challenge …
2016-06-01 11:14:01 +07:00
appleguy
8508d1d63f Merge pull request #1702 from maicki/FixSocialAppPostNodeDivider
[Example] Fix disappearing of social app example divider
2016-06-01 11:13:24 +07:00
appleguy
34815f2447 Merge pull request #1704 from maicki/FixASEditableTextNodeMeasurement
[ASEditableTextNode] Fix measurement of ASEditableTextNode
2016-06-01 11:10:47 +07:00
Michael Schneider
e84f9f27c2 Fix measurement of ASEditableTextNode
- Add ability to measure the ASEditableTextNode based on the content now by calling measure:
- ASEditableTextNode considers preferredFrameSize now
- Fix crash if ASEditableTextNode is included in a horizontal stack
- Add tests for ASEditableTextNode
2016-05-31 16:29:40 -07:00
ricky
b66b519bd6 assert that child is not nil
Summary:

Test Plan:

Reviewers:

Subscribers:

JIRA Issue(s):

Service(s):
2016-05-31 10:29:46 -07:00
Rajinder Ramgarhia
1b7d68f63f [ASPINRemoteImageDownloader] Allows setting authentication challenge block 2016-05-31 10:06:54 -04:00
Michael Schneider
521786cf64 Fix disappearing of social app example divider
UITableViewCell traverses through all its descendant views and adjusts their background color accordingly either to [UIColor clearColor], although potentially it could use the same color as the selection highlight itself. After selection, the same trick is performed again in reverse, putting all the backgrounds back as they used to be. But in our case, we don't want to have the background color disappearing so we reset it after highlighting or selection is done.
2016-05-30 15:02:59 -07:00
appleguy
89f4653cc9 Merge pull request #1696 from maicki/FixImageNodeOpaqueBackground
[ASImageNode] Fix image sometimes appearing with black background or completely disappearing in ASImageNode
2016-05-28 22:56:16 +07:00
appleguy
a7c1ecb858 Merge pull request #1671 from Eke/ASVideoPlayerNode
ASVideoPlayerNode initial version
2016-05-28 14:24:33 +07:00
rcancro
cf2d9aef5c fix crash when setting layoutSpec's child to nil 2016-05-26 15:44:21 -07:00
Michael Schneider
73ce8c148a Add comment for setting the backgroundColor in ASImageNode 2016-05-26 10:01:12 -07:00
Erekle
4f40f3c12f Merge remote-tracking branch 'facebook/master' into ASVideoPlayerNode
# Conflicts:
#	AsyncDisplayKit.xcodeproj/project.pbxproj
2016-05-26 12:15:23 +04:00
ricky
096f20c8d5 update sample app 2016-05-25 13:34:43 -07:00
ricky
bebc4c604c remove _child from ASLayoutSpec.mm. Store all children in the children array. 2016-05-25 13:30:35 -07:00
ricky
c42b0dd33a Remove explicit passing of trait collection to setChild/Children 2016-05-25 10:49:42 -07:00
Michael Schneider
e3e9d36f56 Fix image sometimes appearing with black background or completely disappearing in ASImageNode 2016-05-25 10:07:34 -07:00
Nick Velloff
bde4fe7e24 remove exclusive => true due to 1.0.0 changes (#1695) 2016-05-25 21:34:07 +07:00
Levi McCallum
95f1ab4902 [ASDisplayNode] Rename ASDisplayNodeTransitionContext to ASLayoutTransition (#1680)
* [ASDisplayNode] Rename ASDisplayNodeTransitionContext to ASLayoutTransition

* Rename internal ivar to fit new naming

* Fix tabbing
2016-05-25 10:10:27 +07:00
ricky
a33966d4ae Actually propagate the traits down on layout spec 2016-05-24 11:15:41 -07:00
Nick Velloff
d0c30a43ca expose relayoutAllNodes at ASCollectionView level (#1683)
* expose relayoutAllNodes at ASCollectionView level

* rename relayoutAllNodes to relayoutItems to be more UIKit centric
2016-05-24 13:22:01 +07:00
ricky
59a26ee111 [ASTraitCollection] Bug fixing/LayoutSpec propagation
* Fixed bug in `ASEnvironmentMergeObjectAndState`
* New ASLayoutSpec methods for `setChild`/`setChildren`/`setChild:forIdentifier:` have been added to take in a trait collection.
* Added `setChild:`-like methods for ASLayoutSpecs take a traitCollection
* Fixed instances where nodes in a data controller were not getting their trait collections
* propagate traitCollection in ASDisplayNode on insertSubnode or addSubnode
2016-05-23 16:37:40 -07:00
Erekle
4ab0f1ec60 [ASVideoPlayerNode] fixes; Ability to add custom controls 2016-05-23 23:23:33 +04:00
Erekle
03f193c58b Merge remote-tracking branch 'facebook/master' into ASVideoPlayerNode 2016-05-22 13:49:36 +04:00
Garrett Moon
94bb3b79cb May as well use the existing visibility function. (#1684) 2016-05-22 14:12:29 +08:00
Rocir Santiago
e8a49b57bc Change ASTableView's visibleNodes interface to return array of ASCellNodes (#1666) 2016-05-22 14:10:12 +08:00
Eric
4ac2d52a06 Allow nil borderColor when using ASImageNodeRoundBorderModificationBlock (#1686) 2016-05-21 11:12:40 +08:00
Eric Jensen
d3c33a38bb Add missing nullability annotations to headers related to display node transitions (#1688) 2016-05-21 11:10:07 +08:00
Erekle
49b2726632 fixed old examples 2016-05-20 12:21:57 +04:00
Jonas Schmid
94b88ad1ab Removed DevelopmentTeam setting in sample (#1682) 2016-05-19 13:20:37 -07:00
Erekle
100d2b4f26 moved spinner to ASVIdeoPlayerNode 2016-05-19 15:07:39 +04:00
Erekle
3d5385dad3 replaced deprecated methods 2016-05-19 13:40:09 +04:00
Erekle
053b14992c Merge remote-tracking branch 'facebook/master' into ASVideoPlayerNode
# Conflicts:
#	AsyncDisplayKit/ASVideoNode.h
#	AsyncDisplayKit/ASVideoNode.mm
2016-05-19 11:57:16 +04:00
appleguy
4036904869 Merge pull request #1676 from Xinchi/patch-3
[ASVideoNode] API improvements: new delegate methods related to recovering from buffering stalls, etc.
2016-05-18 22:16:34 -07:00
Max Gu
73b41ee450 Renaming the delegate flags for the deprecated methods 2016-05-18 22:10:06 -07:00
Max Gu
1c64a4a785 Surpressing deprecated methods warning 2016-05-18 16:39:45 -07:00
Max Gu
90877847c2 Adding deprecated methods back 2016-05-18 14:05:08 -07:00
Max Gu
a93bc72e25 Updating and adding a few APIs for ASVideoNode 2016-05-18 08:40:58 -07:00
Max Gu
772cf15b83 Merge branch 'master' into patch-3 2016-05-18 08:37:24 -07:00
Max Gu
b91f1f8336 Merge remote-tracking branch 'upstream/master' 2016-05-18 08:37:11 -07:00
Max Gu
325e37020c Adding startup loading state in ASVideoNode 2016-05-17 15:31:30 -07:00
Erekle
39e287f0d6 fixes suggested by levi 2016-05-18 00:45:40 +04:00
Erekle
d9b84db614 Merge remote-tracking branch 'facebook/master' into ASVideoPlayerNode 2016-05-17 23:34:20 +04:00
Max Gu
74584e2f8e Merge branch 'ASVideoPlayerNode' of https://github.com/Eke/AsyncDisplayKit into ASVideoPlayerNode 2016-05-17 11:10:22 -07:00
Erekle
8c8fc3dba0 Adding ASVideoPlayerNode 2016-05-17 11:08:53 -07:00
Scott Goodson
9c5b2fcb18 [Cocoapods] Update podspec to version 1.9.74. 1.9.74 2016-05-17 11:01:09 -07:00
Scott Goodson
d26b489529 [Examples] Move several simpler, single-purpose examples to extras to ensure Travis does not time out. 2016-05-17 10:52:43 -07:00
appleguy
a5d1e04b3c Merge pull request #1672 from rcancro/traitCrash
[ASAvailability.h] Add kCFCoreFoundationVersionNumber_iOS_9_0 define
2016-05-16 20:23:02 -07:00
Hannah Troisi
97f95e6799 Fix category name collision (Travis error). 2016-05-16 17:35:41 -07:00