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,676 Commits 371 Branches 222 Tags
fixLockingInControlNodeDebug
Commit Graph
4676 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Scott Goodson 8d9107f57e [Examples, Build] Moving some smaller / less useful examples to a separate directory, speeding up builds. 2016-04-22 19:41:43 -07:00
Scott Goodson 613832fc6a [Build] Improve formatting of build script output for Travis. 2016-04-22 19:37:20 -07:00
appleguy bbdbb3d82d Merge pull request #1577 from Adlai-Holler/CellNodeLayoutDelegateFix 
[ASCellNode] Repair Layout Delegate Behavior When Triggered Off-Main
 2016-04-22 19:22:16 -07:00
Adlai Holler 05b22531e6 Include necessary header 2016-04-22 19:12:38 -05:00
Michael Schneider 5cfc16733a Add node as parameter in ASLayoutSpecBlock 2016-04-22 11:22:20 -07:00
Michael Schneider 79e5337948 Fix setter override for setLayoutSpecBlock: 2016-04-22 11:22:01 -07:00
Michael Schneider fde8f1af0e Change layoutSpecBlock against NULL 2016-04-22 11:21:42 -07:00
Michael Schneider f3c48805e0 Add better comments for layoutSpecBlock 2016-04-22 11:08:13 -07:00
Adlai Holler a216b17b01 Merge branch 'master' into ImageNodeImprovements 
Conflicts:
	AsyncDisplayKit/ASNetworkImageNode.mm
 2016-04-22 12:36:58 -05:00
Adlai Holler bc8a2b19ef [ASNetworkImageNode] Carry recent progress image block changes over from multiplex image node 2016-04-22 12:34:13 -05:00
Adlai Holler f5adc7999b [ASMultiplexImageNode] Reduce lockage in visibilityDidChange 2016-04-22 12:23:02 -05:00
Adlai Holler f66d109928 Update project metadata for ASCellNode.m -> ASCellNode.mm 2016-04-22 12:07:37 -05:00
Adlai Holler ea777456b6 [ASCellNode] Apply layout delegate behavior in -__setNeedsLayout, not -setNeedsLayout 2016-04-22 12:07:37 -05:00
Aaron Schubert c3ec99af1e Fix merge conflicts 2016-04-22 09:28:23 +01:00
appleguy e3aa2230f2 Merge pull request #1572 from maicki/AddLayoutSpecBlock 
[ASDisplayNode] Add .layoutSpecBlock API to provide an ASLayoutSpec requiring subclass.
 2016-04-21 21:10:30 -07:00
appleguy 4b2817ade2 Merge pull request #1576 from maicki/FixMissingPodTargetError 
[Build, Examples] Fix Podfile is missing target for samples
 2016-04-21 20:54:41 -07:00
appleguy 6c0ec8b423 Merge pull request #1579 from Xinchi/ASVideoNode 
Removing an unnecessary assertion in ASVideoNode
 2016-04-21 20:45:59 -07:00
appleguy 450c12ee3a Merge pull request #1578 from tomizimobile/master 
[ASCellNode] Remove nodeLoaded check that can cause some necessary layout passes to be skipped.
 2016-04-21 20:12:37 -07:00
Scott Goodson 324a73f6e1 [Build] Some performance optimizations for the build, and now using xcpretty to make raw xcodebuild slightly less horrible / more like xctool. 2016-04-21 19:56:07 -07:00
Scott Goodson af0c2f5c37 [Build] Switch from xctool to xcodebuild to work around Travis image bugs 
The output is far less readable, but it seems much more reliable.  See:
https://github.com/travis-ci/travis-ci/issues/3986
 2016-04-21 19:35:05 -07:00
Max Gu 13fc13fb56 Removing an unnecessary assertion in ASVideoNode 2016-04-21 15:20:08 -07:00
Tom King 7eca4f26cf remove check for self.isNodeLoaded to fix layout issues of ASCellNodes in an ASCollectionView when being resized after calling setNeedsLayout() 2016-04-21 16:13:57 -04:00
Scott Goodson fe30e3f5da [ASImageNode] Adjust category naming for AnimatedImage properties to fix compiler warnings. 2016-04-21 12:32:59 -07:00
Michael Schneider 563e52bb6a Fix Podfile is missing target for samples 2016-04-21 11:07:08 -07:00
Michael Schneider 5afce83241 Adjust indention of comment 2016-04-21 07:07:17 -07:00
Aaron Schubert ebf548fead [tvOS] Make -getView a single line 2016-04-21 09:39:01 +01:00
Aaron Schubert 7b0a8f5af3 [tvOS] Improve -getView by making use of helper method 2016-04-21 09:33:32 +01:00
Aaron Schubert b586b9f34b Fix merge conflicts 2016-04-21 09:26:40 +01:00
Aaron Schubert e2fa2f8192 [tvOS] Address comments on previous PR. 2016-04-21 09:23:47 +01:00
Aaron Schubert 39a6aa3437 [tvOS] Improve naming of method 2016-04-21 09:02:31 +01:00
Aaron Schubert 06d4573b14 [tvOS] Branch out tvOS specific code into it's own categories 2016-04-21 08:59:14 +01:00
Michael Schneider 87a37a283e Add a block API to provide an ASLayoutSpec without having to subclass ASDisplayNode 2016-04-20 19:16:54 -07:00
appleguy dd4853bf3a Merge pull request #1273 from aaronschubert0/tvOS 
[tvOS] Add default focus states to ASControlNode & ASImageNode.
 2016-04-20 13:29:31 -07:00
Aaron Schubert dbb9026415 Remove .orig files 2016-04-20 08:50:30 +01:00
Hannah Troisi f5a3bdc19b Merge remote-tracking branch 'facebook/master' 2016-04-19 20:57:55 -07:00
appleguy dbc68c3a8f Merge pull request #1525 from maicki/ASCollectionViewASTableViewRespondsToSelector 
Add caching respondsToSelector calls in ASCollectionView and ASTableView
 2016-04-19 19:45:19 -07:00
Hannah Troisi 46f04eb7eb Merge remote-tracking branch 'facebook/master' 2016-04-19 18:49:04 -07:00
appleguy b8379a07a6 Merge pull request #1563 from maicki/FollowupFixASCollectionNodeASTableNodeBackgroundColor 
Follow up for ASCollectionNode and ASTableNode background color fix
 2016-04-19 18:11:28 -07:00
appleguy be6c3ed88c Merge pull request #1543 from aaronschubert0/ASMapNode-Remove-Red-Herring 
[ASMapNode] Remove assertion that checks calculatedSize rather than options.size.
 2016-04-19 16:47:33 -07:00
appleguy 74b866e6ba Merge pull request #1559 from garrettmoon/upstream-GIF-Cleanup 
[ASImageNode] Follow up to animated GIF PR
 2016-04-19 16:43:49 -07:00
appleguy 966c579d31 Merge pull request #1557 from ejensen/video-player-item-replace 
[ASVideoNode] Reuse existing AVPlayer when available
 2016-04-19 16:40:03 -07:00
appleguy c67e24b713 Merge pull request #1558 from ejensen/video-resume-when-visible 
[ASVideoNode] Limit resuming of buffered videos to those that are visible
 2016-04-19 16:38:45 -07:00
appleguy 66fd92c827 Merge pull request #1562 from maicki/FixNSProxyMethodSignatureForSelectorCalled 
[ASDelegateProxy] Fix "[NSProxy methodSignatureForSelector:] called!" crash
 2016-04-19 16:34:35 -07:00
Michael Schneider 8f1beb8bf6 Addressed comments 
- Use memset to clear flags
- Fix check for asyncDataSourceNodeForItemAtIndexPath
- Fix selector for asyncDelegateCollectionViewDidEndDisplayingNodeForItemAtIndexPath
- Fix multiple collectionViewWillEditCellsAtIndexPaths:batched: calls
 2016-04-19 16:13:30 -07:00
Michael Schneider d9f16e0acf Use _performingBatchUpdates for _layoutFacilitator batched parameter 2016-04-19 16:13:30 -07:00
Michael Schneider 3a20c6a1f4 Add caching for delegate and datasource calls in ASCollectionView and ASTableView 2016-04-19 16:13:30 -07:00
Michael Schneider 42174210c5 Follow up for ASCollectionNode and ASTableNode background color fix 2016-04-19 16:07:42 -07:00
Michael Schneider 68de6a6391 Fix "[NSProxy methodSignatureForSelector:] called!" crash 2016-04-19 15:06:00 -07:00
Garrett Moon 0fc39d1ccd Follow up to animated GIF PR 2016-04-19 13:43:41 -07:00
Eric Jensen 4a010337f6 Limit resuming of buffering videos to those that are visible 2016-04-19 13:21:06 -07:00