appleguy
2c194fd924
Merge pull request #1140 from rcancro/textNodeWordSpacing
...
[ASTextNode] Added ASTextNodeWordKerner support
2016-01-28 15:38:00 -08:00
rcancro
7f6f2fed11
Added ASTextNodeWordKerner support to ASTextNode
...
* Added a member to `ASTextKitAttributes` that is an optional delegate to the struct's NSLayoutManager.
* Changed ASTextNode to set this delegate to an instance of ASTextNodeWordKerner.
* Updated init method of `ASTextKitContext` to take an optional NSLayoutManager delegate
* Added the files in TextKit folder to the public headers (so we can include ASTextNodeTypes.h)
2016-01-28 08:38:22 -08:00
Samuel Hsiung
8c963bd13c
Fix attribute value setting in testLinkInTextUsesForegroundColor in ASTextKitTests
2016-01-27 23:51:44 -08:00
appleguy
e22c50101a
Merge pull request #1134 from bimawa/ASTextNodeAddTestCase
...
Added additionalTruncationMessage Unit test
2016-01-27 22:45:19 -08:00
appleguy
5b9be8a8c3
Merge pull request #1127 from samhsiung/foreground_color_link
...
[ASTextKit] Use NSForegroundColorAttributeName for links in ASTextKitRenderer
2016-01-27 22:42:04 -08:00
Maxim Bunkov
8a8843a32a
Added additionalTruncationMessage Unit test
2016-01-28 10:27:58 +05:00
Samuel Hsiung
90ac40020f
Use NSForegroundColorAttributeName for links in ASTextNodes by subclassing NSLayoutManager
2016-01-27 21:13:28 -08:00
Levi McCallum
411d0b3deb
Add tests for setNeedsDataFetch and out of range fetch behavior
2016-01-27 18:24:59 -08:00
yury
a0b7254213
[text] Fix crash when highlighted range exceeds truncation range
2016-01-26 22:37:44 +03:00
Huy Nguyen
3bb8967b96
Enable ASCollectionViewTests:testCollectionViewController
2016-01-25 22:26:30 -08:00
Luke Parham
41721aa42a
merged with master
2016-01-24 23:14:43 -06:00
Luke Parham
98fb2e46d4
wip but currently adding first frame as placeholder until it should play and removed extraneous 'pause'
2016-01-24 23:13:17 -06:00
Scott Goodson
9ddf68fa96
[ASTextNode] Optimize handling of constrained size to almost never recreate NSLayoutManager
...
This also fixes two fairly subtle but serious bugs, #1076 and #1046 .
2016-01-24 00:50:43 -08:00
Luke Parham
d9559111a0
renamed nic cage sample, added redundancy for loading player in case its nil when visible, added video tests, disabled assert for new range controller
2016-01-14 02:39:36 -06:00
Luke Parham
579313f086
Merge branch 'master' into ASVideoNode
2016-01-13 12:22:55 -06:00
Scott Goodson
55861b3de1
Update the expectations of the tests now that the clearContents behavior is corrected.
2015-12-27 16:37:33 -08:00
Scott Goodson
44feece701
Implement node-backing for ASTableView and ASCollectionView, with a strong back-pointer in these cases.
2015-12-26 23:05:34 -08:00
Luke Parham
5fbf39644b
merged upstream
2015-12-26 01:33:34 -06:00
Scott Goodson
882d4b336e
Merge branch 'master' into pr/664
2015-12-25 14:32:41 -08:00
Scott Goodson
7ece41ff64
Delegate definition tweaks for Table and Collection; ensure Table tests run with ARC enabled.
2015-12-24 21:41:12 -08:00
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
