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
Hannah Trosi f6d30b668d add comments to deprecated getter methods, remove extraneous if statements 2016-07-05 21:30:09 -07:00
Hannah Troisi edd656f321 update cocoapod stats 2016-07-05 18:48:15 -07:00
Hannah Trosi 3994f2089c [ASCellNode] Final revisions to behavior of setSelected: & setHighlighted: 2016-07-05 17:47:00 -07:00
Gareth Reese b9b002354a [ASVideoNode] Only seek to beginning when auto repeating 2016-07-05 13:27:53 +01:00
Hannah Troisi 682ddcfe51 [AsyncDisplayKit+Utilities.h] Convenience methods for creating resizable circles & rounded rects. (#1811) 
* [AsyncDisplayKit+Utilities.h] UIImage category for performant (optionally rounded) flat color stretchable images

* treat clear background color as no background color (D99117)

* add borderWidth

* add several shorter methods per Scott's comment

* rename files and add to AsyncDisplayKit.h

* fix xcode project file

* update commentse
 2016-07-04 16:34:16 -07:00
Hannah Troisi 3763df1f06 [Example] Resolved ASTextNode bugs (test app to reproduce issues, do regression testing) (#1803) 
* [Examples] text node known inconsistencies with UILabel

* addressed @appleguy's comments
 2016-07-04 14:48:31 -07:00
Michael Schneider c20f452dca Remove check for [UIDevice systemVersion] check if running on iOS 7 (#1843) 2016-07-03 21:47:35 -07:00
Michael Schneider 9de014f179 Change applySubnodeTransition to startTransition 2016-07-03 14:38:26 -07:00
Michael Schneider bf6fbd173d Address first comments 2016-07-03 13:33:23 -07:00
Hannah Trosi 61d7c093a1 Merge branch 'master' into selectionBug 2016-07-02 11:50:19 -07:00
Hannah Trosi d8b3878a59 Merge remote-tracking branch 'facebook/master' 2016-07-02 11:47:06 -07:00
Hannah Trosi 3080ee33cf Revert "update from master/" 
This reverts commit d7fde61e16.
 2016-07-02 11:45:40 -07:00
Michael Schneider 52a34db884 Add pending state for range mode in ASTableNode and ASCollectionNode 2016-07-02 10:27:52 -07:00
Adlai Holler d8c0253321 Merge pull request #1830 from maicki/FixUnbalancedEndBatchUpdatesCalls 
[ASDataController] Prevent calling endUpdatesAnimated:completion: in an unbalanced way
 2016-07-02 10:19:27 -07:00
Michael Schneider 9be2f1db4e Prevent calling endUpdatesAnimated:completion: in an unbalanced way 2016-07-02 10:17:09 -07:00
Adlai Holler 5d7f3b4293 Merge pull request #1819 from kielgillard/master 
[ASDisplayNodeExtras] Collect subnodes passing the test
 2016-07-02 08:55:51 -07:00
Adlai Holler 4d67b44944 Merge pull request #1808 from maicki/MSCacheSelectorFlagsNetworkImageNode 
[ASNetworkImage] Use flags to cache instead of instance variables for caching respond to selector calls
 2016-07-02 08:39:59 -07:00
Adlai Holler f4ccb93969 Merge pull request #1788 from gazreese/ASVideoNode-overwrittenplaceholder 
[ASVideoNode] issue #1782 Placeholder images are replaced by blanks during loading
 2016-07-02 08:30:38 -07:00
Scott Goodson d2d8b0a1cb [ASDisplayNode] Adjust behavior of -removeFromSupernode to ensure "root" nodes are removed from their superview/superlayer. 
This situation is relatively uncommon.  If a user manually uses -[UIView addSubnode:], the convenience category method,
and then calls -[ASDisplayNode removeFromSuperview] -- we would bypass performing the actual removal as no supernode pointer
is set.  After further consideration, the special handling here to support divergence between the supernode pointer and
the view / layer hierarchy is not something we need to maintain going forward, and removing it makes addressing this easy.
 2016-07-01 20:11:23 -07:00
Michael Schneider 01fed69b26 Adds trampoline for inserting and deletion of nodes 
Currently measurement always needs to happen on the main thread if implicit hierarchy management is enabled as adding and removing from nodes needs to happen on the main thread. We now will trampoline to the main thread to do the insertion and deletion of nodes.

This also resolves the issue that can occur if a node is already loaded deep in the layout hierarchy in the layout that the node is transforming to. Before insertion or deletion is happening we need to crawl the layout hierarchy to check that though.
 2016-07-01 16:33:37 -07:00
Hannah Trosi d7fde61e16 update from master/ 2016-07-01 16:25:48 -07:00
Hannah Trosi a204f30bf3 Merge remote-tracking branch 'facebook/master' 2016-07-01 16:17:20 -07:00
Michael Schneider 9501299eed Use flags to cache instead of instance variables for caching respond to selector calls 2016-07-01 16:02:58 -07:00
Adlai Holler a77a6eaaf5 Merge pull request #1820 from gazreese/ASCollectionView-tuning-parameters 
[ASCollectionView] Tuning parameters not set
 2016-07-01 15:09:01 -07:00
Adlai Holler 988098be26 Merge pull request #1837 from gazreese/ASVideoPlayerNode-placeholder-image 
[ASVideoPlayerNode] Expose placeholder image for the underlying ASVideoNode
 2016-07-01 14:50:29 -07:00
Adlai Holler 3814f42074 Merge pull request #1838 from levi/patch-18 
[ASPagerNode] Add nodeForPageAtIndex:
 2016-07-01 14:21:35 -07:00
Adlai Holler 5dcc7e9430 Merge pull request #1823 from facebook/AHExposePINDownloader 
[Project] Publicize ASPINRemoteImageDownloader.h
 2016-07-01 14:21:16 -07:00
Adlai Holler 96fb5b3261 Merge pull request #1786 from maicki/FixPlaceholderIsNotAppearing 
[ASDisplayNode] Handle placeholder layer creation in case the size of the node changes after the initial placeholder layer was created
 2016-07-01 13:54:01 -07:00
Adlai Holler d8efa54f21 Merge pull request #1806 from maicki/MSAddASButtonNodePreferredFrameSize 
[ASButtonNode] Add support for 'preferredFrameSize' to ASButtonNode
 2016-07-01 13:50:33 -07:00
Adlai Holler d80a4430f2 Merge pull request #1840 from facebook/AHRemoveAggregateInitializer 
[ASDataController] Remove Aggregate CGRect Initializer
 2016-07-01 11:58:35 -07:00
Adlai Holler ebaa2c157e Remove aggregate CGRect initializers in ASDataController 2016-07-01 11:47:05 -07:00
Levi McCallum 53bc126ae5 Add implementation of nodeForPageAtIndex: 2016-07-01 09:42:39 -07:00
Levi McCallum b1ceab7a61 Add nodeForPageAtIndex: to header and clean up doc 2016-07-01 09:39:36 -07:00
Gareth Reese 0a5f03e8fc Merge master into ASVideoPlayerNode-placeholder-image 2016-07-01 15:33:00 +01:00
Gareth Reese 09a344b669 [ASVideoPlayerNode] Expose the placeholder image for the video player node 2016-07-01 15:15:10 +01:00
ricky 8c3025bb12 [ASDisplayNode] added asyncTraitCollectionDidChange method (#1831) 
Subclasses can override this method to react to a trait collection change
 2016-06-30 19:45:29 -07:00
Michael Schneider 8804342a98 Don't propagate trait collections to cells if the node is not loaded yet (#1833) 
This fixes an issue where the propagation of trait collections trigger are creation of the node if the node view was not loaded yet.
 2016-06-30 19:44:40 -07:00
Adlai Holler e5b5bbad5b Merge pull request #1832 from maicki/MSFixImport 
Change @import to #import
 2016-06-30 08:55:30 -07:00
Adlai Holler 04b0aceb8b Merge pull request #1835 from facebook/AHMakeIndexSetHelpersFrameworkVisible 
[Framework Build] Make NSIndexSet Helpers Framework-Visible
 2016-06-30 08:47:14 -07:00
Adlai Holler 27b99cf0b6 Make NSIndexSet helpers framework-visible 2016-06-30 08:46:11 -07:00
Michael Schneider 53f22da1dc Code style improvements 2016-06-30 07:30:57 -07:00
Michael Schneider d1b4e07d0f Add support for 'preferredFrameSize' to ASButtonNode 2016-06-30 07:30:57 -07:00
Michael Schneider 5f7cdbd9ca Handle placeholder layer creation in case the size of the node changed after the initial placeholder layer was created 2016-06-30 07:30:17 -07:00
Michael Schneider f0e96cc808 Change @import to #import 2016-06-30 07:18:30 -07:00
Adlai Holler 284160b07b Merge pull request #1821 from maicki/MSAddConformsToProtocolToProxy 
[ASDelegateProxy] Add `conformsToProtocol:`
 2016-06-29 09:18:14 -07:00
Adlai Holler 45ef91171d [ASTextNode] Release Lock Sooner in -setAttributedText: (#1828) 
* [ASTextNode] Release lock sooner in -setAttributedText:

* [ASTextNode] Expand the critical scope a bit
 2016-06-28 20:18:30 -07:00
Gareth Reese 1d356242fd [ASVideoNode] Ensure that observer methods don't observer all other ASVideoNode objects 2016-06-28 15:41:26 +01:00
Adlai Holler d82e1ce95b Merge pull request #1812 from facebook/AHUpdateIntegrity 
[ASDataController] Improve Update Handling, Esp. Reloading Sections
 2016-06-27 18:11:11 -07:00
Adlai Holler db9826c4c6 Add a space for Jenkins testing 2016-06-27 17:30:06 -07:00
Hannah Troisi 0414cf7c9b Jenkins build test 4 2016-06-27 17:24:01 -07:00