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
Adlai Holler 654518b2b9 Fix nullability of ASMultiplexImageNode.imageManager 2016-05-07 15:16:52 -07:00
Adlai Holler fab117b824 [ASPINRemoteImageDownloader] Call download progress handler 2016-05-07 15:14:30 -07:00
appleguy 0fcd8c96d4 Merge pull request #1634 from hannahmbanana/patch-5 
[README.md] Removing Slack badge to save server time
 2016-05-07 01:20:49 -07:00
Hannah Troisi 9f75e9a8e0 [README.md] Removing Slack badge to save server time 
Will re-add once we have we have unlimited server time (paid Heroku account or deployed on our own server).
 2016-05-07 01:20:13 -07:00
Hannah Troisi 970f0e229c Merge remote-tracking branch 'facebook/master' 2016-05-07 01:02:41 -07:00
appleguy d5b6baf669 Merge pull request #1633 from hannahmbanana/patch-4 
[Update README.md with Slack badge + invite bot]
 2016-05-06 23:44:28 -07:00
Hannah Troisi 73850f24bb [Update README.md with Slack badge + invite bot] 
- update cocoapods numbers
- add slack badge - clicking it should take you to a slack invite landing page using a slack invite bot hosted on Heroku (Slackin)
 2016-05-06 23:43:29 -07:00
Adlai Holler 253692df65 [ASMultiplexImageNode] Do not request already-loaded images from data source to avoid loop 2016-05-06 21:45:31 -07:00
appleguy c3ae0d7673 Merge pull request #1622 from maicki/ImproveTransitionIDHandling 
[ASDisplayNode] Improve Transition ID handling
 2016-05-06 19:21:50 -07:00
Erekle c46547ac5f prototype 
Added duration detection in ASVideoNode.
 2016-05-06 21:41:54 +04:00
Michael Schneider d1054d6ed9 Move from ASSentinel to a atomic int 2016-05-05 20:25:07 -07:00
Michael Schneider dc6d2e7660 Improve Transition ID handling 2016-05-05 20:25:07 -07:00
Michael Schneider cac4ed5626 Move layout of ASVideoNode to layout specs 
- This should fix adjusting a custom play button position
- Fix sample project use of ASVideoNode
 2016-05-05 16:49:01 -07:00
Erekle e87fd7a998 first steps 2016-05-06 02:42:17 +04:00
appleguy 62a853b3e9 Merge pull request #1618 from garrettmoon/fixLayoutDeadlock 
[ASDisplayNode] Fix rare deadlock when performing layout on multiple threads with the same node.
 2016-05-05 12:47:08 -07:00
Erekle e9531986d4 Merge remote-tracking branch 'facebook/master' 2016-05-05 22:53:29 +04:00
Garrett Moon dc56c060d0 Add comment for why lock is added. 2016-05-05 10:02:29 -07:00
Michael Schneider bc8489528e Fix crash in delegate / dataSource proxies for ASCollectionView and ASTableView 2016-05-04 21:03:43 -07:00
Michael Schneider 90c3dbc324 Add better comments for deprecated ASTextNode properties 2016-05-04 21:03:31 -07:00
Michael Schneider 29ab87a1e4 Fix API ASTextNode API inconsistencies 
- Deprecate attributedString in ASTextNode in favor of attributedText to be aligned with UILabel
- Deprecate truncationAttributedString in ASTextNode in favor of truncationAttributedText to be aligned with attributedText
 2016-05-04 21:03:31 -07:00
Michael Schneider cad221007e Remove extending NSObject protocol in ASPagerDelegate as ASCollectionDelegate already extends it 2016-05-04 21:03:13 -07:00
Michael Schneider 298b9a2be7 Fix ASPagerNode data source and delegate inconsistencies 
- Change ASPagerNodeDataSource -> ASPagerDataSource
- Add ASPagerDelegate
 2016-05-04 21:03:13 -07:00
appleguy 3ee6c88ae4 Merge pull request #1608 from Eke/master 
[ASVideoNode] Several new delegate methods and ASVideoNodePlayerState to monitor and control playback
 2016-05-04 20:33:23 -07:00
appleguy f5a650d71d Merge pull request #1623 from Adlai-Holler/MapNodeDestroySnapshotter 
[ASMapNode] Remove Retain Cycle, Cancel Snapshotting on Deallocation
 2016-05-04 20:10:38 -07:00
Adlai Holler 646797e335 [ASMapNode: Snapshotting] Cancel on dealloc, avoid retaining self 2016-05-04 18:25:22 -07:00
Erekle 5c3770e543 fixes 2016-05-05 02:03:03 +04:00
Erekle 82cc6f49f2 coding style fixes 2016-05-05 01:49:52 +04:00
Scott Goodson f505c17efe [Build / Cocoapods] Presumably-final fix to AnimatedGIF project configuration. 1.9.73 2016-05-03 21:06:14 -07:00
Scott Goodson 7acdf6ab37 [Build / Cocoapods] Fix AnimatedGIF Podfile to use Sample as the target name, which is the correct one. 2016-05-03 20:42:15 -07:00
appleguy 631fa0e482 Merge pull request #1620 from maicki/FixBuildAnimatedGifExample 
Fix AnimatedGIF example Podfile
 2016-05-03 20:39:49 -07:00
Michael Schneider 23f0ded2bc Fix AnimatedGIF example Podfile 2016-05-03 20:38:11 -07:00
Scott Goodson 44ad32095b [Build / Cocoapods] Use new PINRemoteImage, but temporarily disable tvOS for 1.9.73 due to bulid warnings. 2016-05-03 19:35:57 -07:00
appleguy 58cf96ad67 Merge pull request #1617 from garrettmoon/updatePodspec 
[Build / CocoaPods] Fix podspec linting, beta 2 of PINRemoteImage *should* work with tvos without a subspec
 2016-05-03 19:32:07 -07:00
Garrett Moon 025dd55312 Dang, message local var, not ivar 2016-05-03 15:59:21 -07:00
Garrett Moon 938ecd9b6f Fix deadlock when laying out on multiple threads 
Summary:
We observed a deadlock which occurred when two threads were laying out the same set of nodes.

On one thread, layout would occur on a leaf node. It would lock and as part of this layout
process, ASDK walks up the node tree and calls __setNeedsLayout on its supernode until it
reaches the supernode with no supernode. When the supernode gets its call to __setNeedsLayout
it also locks. So leaf node locks and then awaits supernode lock.

On another thread, we're doing a layout pass on the supernode in the above thread. This locks
the supernode and attempts to lock the leaf node. This deadlocks (remember the above thread
is holding onto the leaf lock and awaiting the supernode lock. This thread is holding onto
the supernode lock and awaiting the leaf lock).

This is all exacerbated by the use of recursive locks.
 2016-05-03 15:56:38 -07:00
Garrett Moon dd87885269 beta 2 of PINRemoteImage *should* work with tvos without a subspec 2016-05-03 15:47:54 -07:00
Erekle b3af10d4ad Merge remote-tracking branch 
# Conflicts:
#	AsyncDisplayKit/ASVideoNode.mm
 2016-05-03 22:59:54 +04:00
appleguy a9e742c92f Merge pull request #1606 from wendylu/render_fix 
[ASNetworkImageNode] Fix threading issue in current image quality
 2016-05-02 18:02:29 -07:00
appleguy 083bc9d028 Merge pull request #1596 from maicki/AddEditorConfig 
[Build / Xcode] Add .editorconfig for coding style
 2016-05-01 23:19:19 -07:00
appleguy 7459b5ddc8 Merge pull request #1607 from chourobin/feature/asset-loading 
[ASVideoNode] Prepare asset for playback in a uniform way
 2016-05-01 16:40:25 -07:00
Erekle 34e6238391 _delegateFlags 
added _delegateFlags like in ASCollectionView
 2016-05-01 17:11:40 +04:00
Robin Chou b700eeb32c Use ASPerformOnMainThread helper. -fetchData improvements. 2016-04-30 17:22:11 -04:00
Wendy fd4d18259e Use dispatch_async for setting currentImageQuality to ensure current order 2016-04-29 22:30:56 -07:00
Scott Goodson 2032cffd90 [Cocoapods, Build] Disable tvOS in podspec for now due to Cocoapods support problems. 2016-04-29 14:50:45 -07:00
Erekle 2c2a73dc83 playbackBufferEmpty and spinner 
added playbackBufferEmpty logic, moved spinner show/hide to separate
methods.
 2016-04-29 20:49:14 +04:00
Michael Schneider 5b2aa9d739 Add .editorconfig 2016-04-29 07:52:44 -07:00
Erekle 399703dbb2 new delegate methods 
Added new delegate methods; updated Videos example project
 2016-04-29 12:59:15 +04:00
appleguy f54dd0f5ef Merge pull request #1587 from maicki/AddAsyncDisplayKitOverviewExample 
[Examples] AsyncDisplayKitOverview: A new app with a catalog of UI components!
 2016-04-28 22:05:24 -07:00
Robin Chou 39ee33f21a Update remaining tests. 2016-04-28 21:13:34 -04:00
Robin Chou 9c2909a968 Updating tests. 2016-04-28 21:04:04 -04:00