GitHub/Texture
1
0
Fork 0
mirror of https://github.com/TextureGroup/Texture.git synced 2026-04-07 19:17:39 +00:00
Code Issues Packages Projects Releases Wiki Activity
4,958 Commits 371 Branches 222 Tags
MSASTextNode2SupportTruncationTokenAttributesMerging
Commit Graph
4958 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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' 1.9.7.1 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
Huy Nguyen 387f3bf634 Properly lock layoutableContextMap 
Signed-off-by: Huy Nguyen <huy@pinterest.com>
 2016-03-29 13:40:57 -07:00
Hannah Troisi f1dbc45cef Move NavigationController and statusBarOpaqueUnderlayView to AppDelegate 2016-03-29 13:13:20 -07:00
Hannah Troisi 53741a4e0a cleaned up model, view files 2016-03-29 13:00:44 -07:00
Eric Jensen a4a0b1f85e Synchronize ASPanningOverriddenUITextView's scrollsToTop when the scrollEnabled property changes 2016-03-29 12:18:57 -07:00
Hannah Troisi 0f4481718c Changed UITableViewController to UIViewController 2016-03-29 00:50:52 -07:00
Hannah Troisi 112bfa8e71 Switched ASDKViewController from UIViewController to ASViewController, renamed files. 2016-03-29 00:04:08 -07:00