Scott Goodson
ca57059322
New ASDelegateProxy class to unify logic for Table & Collection forwarding. Fix dealloc-during-animation crash.
2015-12-23 20:01:52 -08:00
Scott Goodson
38d9ceb230
Fix corrupted project file from merge.
2015-12-23 12:52:38 -08:00
Scott Goodson
9944305cfd
Fix tests to avoid newly deprecated ASCollectionView init variant with asyncDataFetching argument.
2015-12-22 23:36:29 -08:00
Luke Parham
6dc15ffd44
added delegate method for video did finish, moved layer creation to after view displays, rearranged spinner logic, added tests
2015-12-22 15:34:11 -06:00
Luke Parham
e318285089
merged master
2015-12-22 02:17:28 -06:00
Luke Parham
4602e4e9eb
wip fixing pr comments
2015-12-22 02:15:25 -06:00
Adlai Holler
69767d558e
Merge branch 'master' into update-objc
...
Conflicts:
AsyncDisplayKit/Private/ASDisplayNode+FrameworkPrivate.h
2015-12-22 00:28:21 -05:00
Scott Goodson
b8602d1073
Fix ASBasicImageDownloader tests - prevent use of init / new instead of +sharedImageDownloader.
2015-12-20 15:42:57 -08:00
Scott Goodson
92126f0d66
Support surprisingly nice automatic behavior for the unsupported case of view-backed nodes as children of layer-backed ones.
2015-12-19 20:33:28 -08:00
Luke Parham
c69e18bc6e
refactored test
2015-12-19 00:14:17 -06:00
Scott Goodson
ee152eadf1
Remove CALayer and UIView implementations of "name" property.
...
This avoids CoreAnimation from capturing the name from a background thread deep within the internals
of AVPlayerLayer, which commits transactions off the main thread. If the main thread is also accessing
properties that require the lock, in very specific app architectures relying on AVPlayerLayer, this
can cause a deadlock.
The "name" property is primarily used by ASDK's unit test infrastructure, so I'm leaving it in place for
that purpose - and it may still be used for debugging, if someone wants to set it. It will remain
possible to get the node from a layer or view with asyncdisplaykit_node, and access name from there.
2015-12-18 16:01:19 -08:00
Luke Parham
901a8fbd98
fixed video tests
2015-12-18 04:47:26 -06:00
Luke Parham
42efde3821
Merge branch 'master' into ASVideoNode
2015-12-18 03:57:50 -06:00
appleguy
3b5fb17f81
Merge pull request #942 from bsmith11/ASTextKitCoreTextAttributesBug
...
ASTextKit CoreText attributes cleansing should not remove NSParagraphStyle attributes
2015-12-17 19:18:43 -08:00
Luke Parham
b5c1076921
wip, adding play button functionality
2015-12-16 23:02:39 -06:00
Bradley Smith
e64965c1ca
Fixed ASTextKit CoreText attributes bug which was incorrectly reading a NSParagraphStyle as CTParagraphStyleRef
2015-12-15 14:41:37 -05:00
Samuel Hsiung
f9d476e170
Fix ASTextNode truncated size calculation ignoring attributes in the last line
2015-12-15 10:09:03 -08:00
Adlai Holler
7079a9cc79
Merge branch 'master' into update-objc
...
Conflicts:
AsyncDisplayKit/ASDisplayNode+Subclasses.h
2015-12-13 10:05:03 -08:00
Scott Goodson
271f288a19
Polish ASHierarchyState implementation, fix old comment typos, work on test breakages.
2015-12-06 15:04:47 -08:00
Adlai Holler
b16a9e294e
Merge branch 'master' into update-objc
...
Conflicts:
AsyncDisplayKit/ASDisplayNode+Subclasses.h
2015-12-06 12:25:13 -08:00
Adlai Holler
34c487de5b
Fix test
2015-12-04 13:01:15 -08:00
Adlai Holler
05ff0e40ec
Add test case for non-cell node interface state
2015-12-04 12:46:34 -08:00
Adlai Holler
fdfe18873a
Merge branch 'master' into update-objc
...
Conflicts:
AsyncDisplayKit/ASDisplayNodeExtras.h
AsyncDisplayKit/Details/ASTextNodeRenderer.h
AsyncDisplayKit/Details/ASTextNodeShadower.h
2015-12-01 16:45:25 -08:00
Levi McCallum
9d327cd14f
Remove fixme from test
2015-11-30 06:54:51 -08:00
Levi McCallum
52b6c47d23
Allow resizing TextKit tests to pass by taking into account imprecision
2015-11-30 06:46:53 -08:00
Levi McCallum
8114fc4f46
Bring over core TextKit Truncation and Renderer tests from CK
2015-11-30 06:46:52 -08:00
Levi McCallum
197a31f636
Fix mistakenly renamed method in unit test
2015-11-30 06:44:53 -08:00
Levi McCallum
a0c05ebffc
Rename CK classes to AS classes
2015-11-30 06:44:53 -08:00
appleguy
d132416d90
Merge pull request #848 from nguyenhuy/JustifyContentSpaceBetweenAndAround
...
Implement "space between" and "space around" justify content options for stack layout
2015-11-29 21:46:42 -08:00
Huy Nguyen
0077c3eec6
Implement horizontal and vertical alignments for stack layout
2015-11-24 20:57:19 +02:00
Huy Nguyen
1162e02b06
Implement "space between" and "space around" options of stack layout justify content
2015-11-16 19:34:08 +02:00
Adlai Holler
f2a095a459
Fix test build by casting test image identifiers
2015-10-28 21:18:13 -07:00
Adlai Holler
8e104f4887
Merge branch 'master' into update-objc
...
Conflicts:
AsyncDisplayKit/ASCollectionView.h
AsyncDisplayKit/ASDisplayNode.h
AsyncDisplayKit/Details/ASDataController.h
AsyncDisplayKit/Details/UIView+ASConvenience.h
AsyncDisplayKit/Layout/ASLayoutSpec.h
2015-10-28 21:10:27 -07:00
appleguy
2c8626e1f6
Merge pull request #753 from nguyenhuy/DataControllerSortedTransaction
...
Sort edit commands during batch updating of table and collection views
2015-10-26 13:40:06 -07:00
Huy Nguyen
72fca5395f
Inject an ASDataController class to ASTableView, for testing purposes
...
- Injection can be done via a new internal initializer. The class will be used by ASTableView to create (and configure) a new data controller.
- ASTableViewTests now injects its own type of ASDataController. This facilitates new ways for testing ASTableView-specific behaviours. The first application is counting the number of times relayoutAllNodes is called on the data controller.
2015-10-26 13:52:49 +02:00
Huy Nguyen
048566aed5
Fix unstable tests related to relayoutAllNodes in ASTableViewTests
...
- After node constrained sizes were changed (because the table view width was changed, for example) and before relayoutAllNodes is executed (on main), if there is any layout tasks being executed on background, the new sizes will be used immediately. Therefore, by the time relayoutAllNodes is performed, some nodes already have an up-to-date layout and don't need to remeasure.
- As a result, after relayoutAllNodes is completed, the number of layout passes performed on main thread for each node increased between 0 and 1 (i.e some nodes were remeasured, others weren't). ASTableViewTests is updated to assert this behaviour.
2015-10-26 13:47:08 +02:00
Huy Nguyen
53a3b76d6d
Add read-only names to UIView and CALayer
...
- Backed by name of the underlying ASDisplayNode.
- Remove goofy usages of `setValue:forKey:` in ASDisplayNodeTests and ASDisplayNodeAppearanceTests.
2015-10-26 07:44:05 +02:00
Huy Nguyen
fd0b3aaf52
Revert "Revert "Make ASDisplayNode.name Thread Safe""
...
This reverts commit 906d7c759b471eda67b95574199b6f91d46b6782.
2015-10-26 06:29:01 +02:00
appleguy
7d013a70ac
Merge pull request #762 from levi/supplementary-views
...
Respond to supplementary node feedback
2015-10-25 19:45:00 -07:00
appleguy
906d7c759b
Revert "Make ASDisplayNode.name Thread Safe"
2015-10-25 19:40:47 -07:00
appleguy
61429357af
Merge pull request #768 from Adlai-Holler/ThreadSafeName
...
Make ASDisplayNode.name Thread Safe
2015-10-25 12:47:07 -07:00
Huy Nguyen
7b71462763
Refactor ASTableViewTests
...
- Add -triggerFirstLayoutMeasurementForTableView:
- Move -triggerSizeChangeAndAssertRelayoutAllRowsForTableView:newSize to the end of the file.
2015-10-25 18:54:39 +02:00
Adlai Holler
99113388a8
Make tests use CALayer.asyncdisplaykit_node.name rather than CALayer.asyncdisplaykit_name as needed
2015-10-24 10:58:09 -07:00
Levi McCallum
d9ea1b52ea
Fix unit tests
2015-10-22 15:27:48 -07:00
Huy Nguyen
938cd468b3
Add snapshot tests for ASStaticLayoutSpec.
2015-10-19 20:37:20 +03:00
Levi McCallum
31f184b32d
Clear collection view delegate/dataSource on test tear down
2015-10-15 11:40:53 -07:00
Levi McCallum
9a37538582
Clean up and test registration of internal supplementary node kinds
2015-10-15 11:40:53 -07:00
Levi McCallum
12194199cd
Clean up layout delegate protocol API
2015-10-15 11:40:53 -07:00
Levi McCallum
ba72c73779
Clarify default value behavior of the layoutDelegate for flow layouts
2015-10-15 11:40:52 -07:00
Levi McCallum
8a9720dd12
Add tests for constrained size method of flow layout inspector
2015-10-15 11:40:52 -07:00
