2043 Commits

Author SHA1 Message Date
Eric Jensen
cb1579e8af Check the AVAsset's type before casting to an AVURLAsset 2016-02-26 11:00:27 -08:00
appleguy
a3576d5d61 Merge pull request #1280 from davidlawson/master
Added NSArray+Diffing.m and ASDefaultPlayButton.m to iOS Framework target
2016-02-25 19:21:57 -08:00
appleguy
60b68f33de Merge pull request #1271 from maicki/update-examples
[Examples] Improvements to the sample apps - adopt node blocks, general cleanup.
2016-02-25 19:15:55 -08:00
appleguy
d3f75b2281 Merge pull request #1279 from facebook/OpaqueAndBGDisplay
[ASDisplayNode] Bridge should trigger display when opacity or bg color change.
2016-02-25 19:04:05 -08:00
David Lawson
307872099f Added NSArray+Diffing.m and ASDefaultPlayButton.m to iOS Framework target 2016-02-26 13:52:53 +11:00
Scott Goodson
89516129a4 [ASDisplayNode] Bridge should trigger display when opacity or bg color change. 2016-02-25 18:25:39 -08:00
appleguy
93575b20e9 Merge pull request #1277 from nguyenhuy/layout_transition_for_cell_node
[ASCellNode] Notify layout delegate during layout transition
2016-02-25 14:56:05 -08:00
appleguy
6f12444be0 Merge pull request #1265 from rcancro/scaleFactor
[ASTextNode] Stopped trying to cache the currentScaleFactor
2016-02-25 14:54:19 -08:00
appleguy
6e85ad8170 Merge pull request #1274 from Adlai-Holler/AHMapNodeVendAnnotations
[ASMapNode] Promote annotations to a Formal Property
2016-02-25 14:46:33 -08:00
Huy Nguyen
0fe774511c ASCellNode notifies its layout delegate during layout transition 2016-02-25 12:19:14 -08:00
appleguy
7d9ad723fe Merge pull request #1275 from nguyenhuy/fix_didCompleteTransitionLayout
Fix didCompleteLayoutTransition
2016-02-25 11:30:39 -08:00
Huy Nguyen
640b6bdf4a Fix mismatch between the signature of didCompleteLayoutTransition and its implementation 2016-02-25 10:58:36 -08:00
Adlai Holler
60f5ba2d17 Simplify ASMapNode.setAnnotations 2016-02-25 10:40:38 -08:00
Adlai Holler
2fbc7b0942 Make ASMapNode vend its annotations 2016-02-25 10:32:13 -08:00
appleguy
e53c0c2d8c Merge pull request #1272 from nguyenhuy/fix_diffing_algo
[Utilities] Fix diffing algorithm not using custom comparison block
2016-02-24 20:48:19 -08:00
Huy Nguyen
32a8f9c831 Assert comparison block in diffing algorithm 2016-02-24 20:42:18 -08:00
Huy Nguyen
bd1b195dbe Fix diffing algorithm not using custom comparison block 2016-02-24 20:33:02 -08:00
Michael Schneider
bb35470c72 Overall examples improvement 2016-02-24 20:21:42 -08:00
Michael Schneider
6bf150bc65 Add missing super call 2016-02-24 20:18:52 -08:00
Michael Schneider
7dd2fbfad1 Overall improvements for the SocialAppLayout example 2016-02-24 20:18:20 -08:00
Michael Schneider
8418d8be24 Use collectionView:nodeBlockForItemAtIndexPath: in all examples 2016-02-24 20:17:18 -08:00
Scott Goodson
f948a807c9 [AsyncDisplayKit] Increment .podspec version to 1.9.7 in preparation for release. 2016-02-24 17:04:39 -08:00
Scott Goodson
792db0061b [ASMapNode] Perform MKMapSnapshotter callback off the main thread to eliminate UIImage handling overhead. 2016-02-24 17:02:22 -08:00
appleguy
306aec9d5b Merge pull request #1270 from Adlai-Holler/AHFixMapNodeUnhostingView
[ASMapNode] Remove Live Map in clearFetchedData, Not clearContents
2016-02-24 17:01:11 -08:00
Adlai Holler
de46701ff7 [ASMapNode] Remove live map on clearFetchedData, not clearContents 2016-02-24 15:20:02 -08:00
appleguy
db2a606a51 Merge pull request #1269 from garrettmoon/fixButtonLabel
[ASButtonNode] Flex shrink should be set on title init, not image init
2016-02-24 15:16:48 -08:00
Garrett Moon
6a1298440d Flex shrink should be set on title init, not image init 2016-02-24 15:10:18 -08:00
appleguy
439ca172d1 Merge pull request #1267 from eanagel/super-layout-required
[ASDisplayNode] Add NS_REQUIRES_SUPER for -layout.
2016-02-24 13:31:56 -08:00
appleguy
74e6d087d4 Merge pull request #1268 from eanagel/forward-scrollViewDidScroll
[ASTableView] Fix recent regression to ensure scrollViewDidScroll: is forwarded correctly
2016-02-24 13:30:08 -08:00
Ethan Nagel
fa4e20e874 Initialize _asyncDelegateImplementsScrollviewDidScroll so we forward scollViewDidScroll: calls 2016-02-24 11:03:06 -08:00
Ethan Nagel
26dcad5218 Add a warning if [super layout] is not called (which causes big problems for ASLayout.) 2016-02-24 10:28:22 -08:00
rcancro
8dbc8b7df4 reordered conditionals, moved beta things to beta header file 2016-02-24 08:06:10 -08:00
rcancro
878fedd8f3 Stopped trying to cache the currentScaleFactor
Was running into issues where the scale factor would get cleared when setting a new atributedString on a textNode.

I was clearing out the currentScaleFactor when setting an attributedString into a textNode. It appears that `_calculateSize` isn't always called when setting a new string into a ASTextNode. It can be the case that only `drawInContext:bounds:` is called. With _currentScaleFactor cleared out the renderer that calls`drawInContext...` was being called with a scaleFactor of 0.

It could be the case that the fix could be to remove the clearing of `currentScaleFactor` from `setAttributedString`, but this seems like a safer fix to me. It does, however, require an extra run through the font adjuster when enabled.
2016-02-23 16:51:10 -08:00
appleguy
eb6aa28d42 Merge pull request #1263 from levi/patch-5
[ASCollectionView] Enable animated bounds changes
2016-02-23 13:23:31 -08:00
Levi McCallum
c2d379f8f5 Add a bit of documentation to describe the problem this is solving 2016-02-23 13:02:37 -08:00
Levi McCallum
4640801939 Enable animated bounds changes in ASCollectionView 2016-02-23 09:36:11 -08:00
appleguy
92f87756b3 Merge pull request #1261 from garrettmoon/fixASNetworkImageNoCache
[ASNetworkImageNode] Should not assert when it is explicitly provided a nil cache.
2016-02-22 22:16:26 -08:00
Garrett Moon
359d19da29 ASNetworkImageNode should support a nil cache. 2016-02-22 21:58:45 -08:00
appleguy
3abde9348d Merge pull request #1256 from Adlai-Holler/AHAffinityRevisions
[ASDisplayNode] Post-Review Refinements of Recent No-Affinity UIKit/CA Property Bridging
2016-02-22 20:41:59 -08:00
appleguy
3eb0d4e877 Merge pull request #1258 from rcancro/textKitBlocks
[ASTextNode] Add block to customize NSLayoutManager and NSTextStorage (subclass, initialization)
2016-02-22 19:44:34 -08:00
appleguy
75f620aa91 Merge pull request #1257 from Adlai-Holler/FixImageNodeLockingIssue
[ASImageNode:displayDidFinish] Unlock _imageLock Correctly
2016-02-22 19:40:13 -08:00
Adlai Holler
fd5723379f [ASImageNode] Lock & unlock directly instead of using stack objects. 2016-02-22 18:48:31 -08:00
appleguy
79389ba66e Merge pull request #1251 from ekurutepe/fix-umbrella-header
[AsyncDisplayKit] Adjust Umbrella header to ensure Carthage build succeeds.
2016-02-22 18:32:34 -08:00
appleguy
fc99ff5e4c Merge pull request #1259 from Adlai-Holler/ASCellNodeLovesASViewController
[ASCellNode] Use ASViewController.node Directly Instead of Wrapping
2016-02-22 15:18:38 -08:00
Adlai Holler
767bff2e1a [ASInternalHelpers] Use ASDisplayNodeThreadIsMain, reduce block allocations 2016-02-22 15:12:13 -08:00
Adlai Holler
977a509bd4 [ASCellNode] If viewControllerBlock returns an ASViewController, use its node directly instead of wrapping 2016-02-22 15:11:27 -08:00
Adlai Holler
afc70b90ab [ASCellNode] Improve documentation, remove unused ivar 2016-02-22 15:10:02 -08:00
rcancro
00b0968bf7 Add ability to customize NSLayoutManager and NSTextStorage when created in the ASTextKitContext 2016-02-22 13:00:02 -08:00
Adlai Holler
57ca0c73bf [ASImageNode] Correctly unlock _imageLock 2016-02-22 09:12:58 -08:00
Adlai Holler
f4e4c501f1 [ASDisplayNode] Remove misplaced comment that has been replaced 2016-02-22 09:06:36 -08:00