Commit Graph

3364 Commits

Author SHA1 Message Date
Gareth Reese
c8a414be9b Merged branch 'master' into AVPlayerItem-construction 2016-04-06 15:22:10 +01:00
appleguy
b3d6b545f8 Merge pull request #1478 from lappp9/muting-video-nodes
[ASVideoNode] Ensure mute property is passed onto the internal player
2016-04-05 22:10:43 -07:00
appleguy
26c8b0437e Merge pull request #1474 from Adlai-Holler/AHFilterInvalidMapSnapshotDimensions
[ASMapNode] Never Provide Invalid Snapshot Dimensions to MapKit
2016-04-05 22:03:31 -07:00
Hannah Troisi
7a5c64f59e Removed resetDataModel on tab switching. 2016-04-05 21:59:16 -07:00
appleguy
5ebfedf645 Merge pull request #1484 from Adlai-Holler/AHNoDuplicateActions
[ASControlNode] Deduplicate Target-Action-Events Entries, Fix Exception When Removing Nil Target
2016-04-05 18:48:15 -07:00
Adlai Holler
9e56cb553f [ASControlNode] Squash duplicated target-action-event tuples, fix assertion failure removing nil target 2016-04-05 15:51:53 -07:00
appleguy
40e12b9830 Merge pull request #1482 from maicki/FixSettingASEnvironmentStateExtensions
Fix setting and add merging ASEnvironmentStateExtensions
2016-04-05 15:29:42 -07:00
Michael Schneider
27cc2bec82 Add merging ASEnvironmentStateExtensions on upward propegation 2016-04-05 14:22:32 -07:00
Michael Schneider
41eb1917e4 Fix setting ASEnvironmentStateExtensions values 2016-04-05 14:22:32 -07:00
appleguy
95b9374fd5 Merge pull request #1481 from maicki/FixASLayoutableExtensibilityComments
Fix comments about maximum number of extended values in ASLayoutableExtensibility
2016-04-05 13:08:01 -07:00
Michael Schneider
5ba756eac7 Fix comments about maximum number of extended values in ASLayoutableExtensibility 2016-04-05 07:44:28 -07:00
Luke Parham
be463c0a17 muting the video node mutes the player 2016-04-05 02:37:07 -05:00
Hannah Troisi
50bb7d9386 - Partial implementation of feature resetPhotoFeedModel when switching between UIKit / ASDK tabs.
- Replaced NSData data fetches with NSURLSession
2016-04-04 20:43:07 -07:00
Hannah Troisi
e07827bf64 Merge remote-tracking branch 'facebook/master' into 500pxgram 2016-04-04 20:33:14 -07:00
Hannah Troisi
caf2e43d57 ASDKgram Refactoring
- replace ASTableView's nodeForRowAtIndexPath: with nodeBlockForRowAtIndexPath:  (performance gain because nodeBlock can be called concurrently)
- replace scrollViewDidScroll: method for determining when to loadPage for ASTableView’s data model with ASBatchContext
2016-04-04 18:46:50 -07:00
Adlai Holler
fd159aa196 [ASMapNode] Never set invalid snapshot dimensions into MapKit 2016-04-04 16:42:51 -07:00
Hannah Troisi
822982bd94 Merge remote-tracking branch 'facebook/master' 2016-04-04 13:38:22 -07:00
appleguy
0ef9d295b9 Merge pull request #1469 from hannahmbanana/ASEnvironmentTweaks
[ASEnvironment - Layout] Fixes to upward propagation of ASLayoutable properties.
2016-04-02 18:35:48 -07:00
Hannah Troisi
dbad1c38e5 [ASEnvironment - Layout] Fixes to upward propagation of ASLayoutable properties. 2016-04-02 15:03:43 -07:00
Hannah Troisi
a817abd43f Merge remote-tracking branch 'facebook/master' 2016-04-01 20:07:51 -07:00
appleguy
7662cb67c1 Merge pull request #1432 from maicki/ASDataControllerCrashOnDataSourceDealloc
[ASDataController] Refactor ASDataController layout nodes methods
2016-03-31 21:49:58 -07:00
appleguy
938437d38f Merge pull request #1455 from ejensen/scrolls-to-top
[ASEditableTextNode] Synchronize scrollsToTop with scrollEnabled
2016-03-31 21:19:45 -07:00
appleguy
234d937c92 Merge pull request #1461 from hannahmbanana/examples_cleanup
[Examples Documentation] add screenshots/gifs to README.md
2016-03-31 21:14:44 -07:00
appleguy
6d1c52b042 Merge pull request #1456 from maicki/ASEnvironment
[ASEnvironment] Add support for ASEnvironment, supporting generalized state propagation both up and down node and layout spec trees.
2016-03-31 21:05:38 -07:00
appleguy
ea935456b8 Merge pull request #1437 from ejensen/editable-text-node-layout-manager
[ASEditableTextNode] Allow TextKit component customization
2016-03-31 20:46:19 -07:00
Michael Schneider
20ee9bca8d Rename ASEnvironmentStateCreate to ASEnvironmentStateMakeDefault 2016-03-31 20:43:20 -07:00
Michael Schneider
5baab95506 Add up propagation of ASEnvironmentLayoutOptionsState in ASLayoutSpec while setting a child 2016-03-31 20:43:20 -07:00
Michael Schneider
f46f5640ff Add improvements
- Remove defaults for ASEnvironmentLayoutOptionsState and ASEnvironmentHierarchyState
- Add locking for ASEnvironmentLayoutExtensibilityForwarding
- Other smaller improvements
2016-03-31 20:43:20 -07:00
Michael Schneider
4e757f0969 General improvements
- Refactor naming of ASEnvironmentCollection to ASEnvironmentState
- Remove struct pointers
- Move ASEnvironmentStatePropagation to a enum class
- Move merge functions to pure functions
- Move ASLayoutOptionsForwarding and ASLayoutableExtensibility into ASLayoutSpec and ASDisplayNode
- Remove ASLayoutableSetValuesForLayoutable and move into explicit classes (ASDisplayNode, ASTextNode)
2016-03-31 20:43:20 -07:00
Michael Schneider
65b4961802 Add extensibility support for ASEnvironmentLayoutOptionsState 2016-03-31 20:43:20 -07:00
Michael Schneider
96df35e41a Initial commit for ASEnvironment 2016-03-31 20:43:20 -07:00
appleguy
94bfc17d0d Merge pull request #1467 from hannahmbanana/master
[Documentation] update README.md to add Carthage sheild + update CocoaPods download count
2016-03-31 19:40:32 -07:00
appleguy
b54c8de27e Merge pull request #1463 from marmelroy/master
[AsyncDisplayKit] - Fix Travis issues
2016-03-31 19:39:38 -07:00
Hannah Troisi
2903d7ea1b removing files required to run website locally 2016-03-31 12:35:59 -07:00
Hannah Troisi
2b18d70de7 Merge remote-tracking branch 'facebook/master' 2016-03-31 12:31:32 -07:00
Roy Marmelstein
4415bbbd06 Workaround for https://github.com/facebook/xctool/issues/666 2016-03-31 10:10:09 +02:00
Roy Marmelstein
f719a06a4c [AsyncDisplayKit] - Switch Travis to Xcode 7.3 2016-03-31 09:55:30 +02:00
Hannah Troisi
eac5b48274 Merge pull request #1 from hannahmbanana/hannahmbanana-patch-1
[Documentation] update README.md
2016-03-31 00:08:09 -07:00
Scott Goodson
212e0f6c2b [AsyncDisplayKit] Move build server to iOS 9.3. Fix Carthage build. 2016-03-31 00:04:56 -07:00
Hannah Troisi
f5a002b867 Update README.md
added Carthage compatibility shield, updated CocoaPods download number (>320k)
2016-03-31 00:04:52 -07:00
Hannah Troisi
4ca0ccfb3e Create Gemfile 2016-03-30 23:30:52 -07:00
Scott Goodson
41948cc8c9 Increment Podspec to 1.9.8 version for this development cycle (not shipping 1.9.8 for a while though). 2016-03-30 16:34:50 -07:00
Hannah Troisi
883f2b2b99 added screenshots/gifs and descriptions to examples/README.md 2016-03-30 12:34:35 -07:00
Hannah Troisi
02509fa225 Testing adding screenshot to README.md 2016-03-30 10:10:39 -07:00
Hannah Troisi
5f45d00bdf Merge remote-tracking branch 'facebook/master' 2016-03-30 09:54:43 -07:00
appleguy
503ab09fe9 Merge pull request #1458 from levi/collectionNodeBetaFix
Make ASCollectionNode+Beta header public to projects
2016-03-29 21:49:15 -07:00
Levi McCallum
320da47de6 Make ASCollectionNode+Beta header public to projects 2016-03-29 21:44:49 -07:00
Hannah Troisi
09d2a1457b Merge remote-tracking branch 'facebook/master' into 500pxgram 2016-03-29 14:55:06 -07:00
Hannah Troisi
55efc4cfb3 Final code cleanup 2016-03-29 14:53:42 -07:00
appleguy
cdf11cebf7 Merge pull request #1454 from nguyenhuy/layoutable_context
[ASLayoutableContext] Properly lock layoutableContextMap
2016-03-29 14:34:07 -07:00