1645 Commits

Author SHA1 Message Date
appleguy
6bd62cbf72 Merge pull request #1110 from yury/fix-truncation
[ASTextNode] Prompt creation of truncater object when the context object is accessed.
2016-01-25 18:05:59 -08:00
appleguy
d70a9551de Merge pull request #1111 from yury/fix-_linkAttributeValueAtPoint-crash
[ASTextNode] Fix out-of-bounds error when truncation string is longer than the original string.
2016-01-25 17:58:07 -08:00
appleguy
1dd6cef58b Merge pull request #1105 from facebook/RangeControlAllNodes
[ASRangeControllerBeta] Scan all nodes after edit operations.
2016-01-25 13:51:09 -08:00
yury
f2012df3af Fix Out of bounds error
Actually it is possible that truncated string is longer then original
string.

For example, original string:

```
hello
this is
very long
message here
and there
```

with maximumNumberOfLines=4, truncationAttributedString = ' ...' and
additionalTruncationMessage = 'read more'

will give

```
hello
this is
very long
message here ... read more
```

So `[attributedString attribute:attributeName atIndex:characterIndex
longestEffectiveRange:&range inRange:visibleRange]` will crash.
2016-01-25 22:25:12 +03:00
yury
313a3cc63c Create Truncater with context. So it will actually truncate string in its initializer 2016-01-25 16:48:55 +03:00
Scott Goodson
e0e019ebcb [ASRangeController] Enable new range controller by default (!!! yay !!!) 2016-01-24 22:50:36 -08:00
appleguy
b3239b6d36 Merge pull request #1106 from lappp9/ASVideoNode
[ASVideoNode] Performance enhancements
2016-01-24 22:29:14 -08:00
Scott Goodson
7ecc302e10 [ASImageNode] remove nullability from imageModificationBlock for Swift bridging.
https://github.com/facebook/AsyncDisplayKit/issues/1092
2016-01-24 22:26:42 -08:00
Luke Parham
526b2ab0cf removed beta range controller 2016-01-24 23:51:34 -06: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
e6d5e2666c [ASRangeControllerBeta] Scan all nodes after edit operations. 2016-01-24 18:42:02 -08:00
appleguy
5a96985b55 Merge pull request #1104 from facebook/ASTextNodeInvalidationOptimization
[ASLayout, ASTextNode] Create -calculatedLayoutDidChange and use it in text node.
2016-01-24 18:19:27 -08:00
appleguy
2a63868e76 Merge pull request #1102 from knopp/ASRangeControlller-get-index-paths-optimization
[ASRangeController] don't get index paths twice if tuning parameters …
2016-01-24 18:19:02 -08:00
Scott Goodson
2713bdd72e [ASTextNode, ASDisplayNode] Create -calculatedLayoutDidChange and use it in text node.
This allows the change in size for the NSTextContainer to occur off the main thread, whenever that size change
is necessary.  Then the text relayout can occur earlier, during the process of computing ASLayoutSpecs.
2016-01-24 17:14:14 -08:00
Matej Knopp
51e4476068 [ASRangeController] don't get index paths twice if tuning parameters are same
Signed-off-by: Matej Knopp <matej.knopp@gmail.com>
2016-01-24 23:41:46 +01:00
appleguy
d70887448c Merge pull request #1101 from facebook/ASRangeControllerPrioritization
[ASRangeControllerBeta] Utilize NSMutableOrderedSet to ensure visible items are prioritized.
2016-01-24 14:39:06 -08:00
Scott Goodson
92ce6ce4d3 [ASRangeControllerBeta] Improve comments, code clarity, cache respondsToSelector: 2016-01-24 14:07:39 -08:00
Scott Goodson
351f4a9afc Utilize NSMutableOrderedSet in ASRangeControllerBeta to ensure visible items are prioritized.
This also adopts Objective-C generics for the various collections in this class.
2016-01-24 13:11:15 -08:00
appleguy
344b3a40e3 Merge pull request #1100 from facebook/ASTextNodeRendererRefactor
[ASTextNode] Optimize handling of constrained size to almost never recreate NSLayoutManager
2016-01-24 01:41:03 -08: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
appleguy
ae68f18388 Merge pull request #1050 from stowy/stowy/asdk_cat_sample
[Example App] New sample that uses a network-loading collection view on iPhone and iPad.
2016-01-23 20:29:02 -08:00
Scott Goodson
82f7956bf9 [ASMapNode] Some improvements to layout logic and snapshot triggering. 2016-01-23 20:12:45 -08:00
appleguy
570d3e202f Merge pull request #1099 from facebook/ASMapNodeRegion
Re-add .region property for API compatibility and convenience, using options object internally.
2016-01-23 16:53:30 -08:00
Scott Goodson
28618f7238 Re-add .region property for API compatibility and convenience, using options object internally. 2016-01-23 16:52:39 -08:00
Sam Stow
3b4785cf24 Added sample project using networking and infinite scrolling and random cats 2016-01-23 14:52:53 -08:00
appleguy
64ad48a248 Merge pull request #1097 from facebook/iOS9ConcurrentImageDecodingSystemBug
[ASImageNode] @synchronized around UIImage draw to prevent concurrently decoding the same instance.
2016-01-23 13:37:36 -08:00
Scott Goodson
264887413e Add @synchronized around UIImage draw to prevent concurrently decoding the same instance.
This is a workaround necessary due to an iOS 9 bug.  I'm not gating it to iOS 9 only so as to
not exaggerate iOS version-specific behavior differences in the framework, since a majority are
on iOS 9 anyway.  If we can confirm the bug is fixed in a later iOS version, then it will be gated.

Issue tracked in greater detail here: https://github.com/facebook/AsyncDisplayKit/issues/1068
2016-01-23 13:35:04 -08:00
Scott Goodson
2c5db2e335 Podfile bump to 1.9.6; minor preparations for release. 2016-01-23 13:05:27 -08:00
appleguy
ea6c7ae938 Merge pull request #1025 from 1nput0utput/ASButtonNodeImprovements
[ASButtonNode] Add support for backgroundImage.  Extend & simplify API with separate title and color.
2016-01-23 12:45:48 -08:00
appleguy
eb7caa3ba6 Merge pull request #1036 from aaronschubert0/ASMapNode
[ASMapNode] now supports MKMapSnapshotOptions to specify map parameters
2016-01-23 12:37:51 -08:00
appleguy
ccbf38c72e Merge pull request #1096 from facebook/pr/1059
[tvOS] Initial changes to support building AsyncDisplayKit for tvOS.
2016-01-23 12:28:43 -08:00
Luke Parham
87f8dbf393 Merge branch 'master' into ASVideoNode 2016-01-23 14:11:33 -06:00
Scott Goodson
fe572c23fb Exclude all of ASMultiplexImageNode from tvOS - for now. 2016-01-23 11:45:09 -08:00
appleguy
ca27702aab Merge pull request #952 from lappp9/ASVideoNode
[ASVideoNode] Basic Video node using AVPlayerLayer.
2016-01-23 11:02:57 -08:00
Scott Goodson
83aaa4637e Revert "ASDataController now handles reloadData more efficiently and notify its delegate once instead of a series of deletes and inserts"
This reverts commit 2e4d716e0b65465d9c65b5821668c38e5fa956c9.

Possible issue with this commit.
2016-01-22 20:33:33 -08:00
appleguy
cb5e5704e2 Merge pull request #1085 from chrisze/master
[ASNetworkImageNode] Add error handler to ASNetworkImageNodeDelegate
2016-01-22 20:05:59 -08:00
appleguy
999e93f0fa Merge pull request #1088 from aaronschubert0/ASTableView-Layout-bug-fix
[ASTableView] Rename _ASTableViewCellDelegate method.
2016-01-22 17:26:18 -08:00
appleguy
f7f468e5d1 Merge pull request #1093 from nguyenhuy/improve_reload_data
[ASDataController] Optimize reloadData to avoid performing deletions or insertions.
2016-01-22 13:34:37 -08:00
appleguy
bde37ac3b8 Merge pull request #1089 from Adlai-Holler/TextNodeIgnoreEmptyStringReplace
[ASTextNode] Ignore Setting Text to Nil When Text Is Already Empty
2016-01-22 11:09:11 -08:00
appleguy
7f1ac58c69 Merge pull request #1095 from aaronschubert0/Code-Coverage-Fix-Coverage
Check to see if Clang code coverage is interfering with GCC
2016-01-22 11:03:20 -08:00
Aaron Schubert
4817484f47 Enable clang code coverage 2016-01-22 14:22:40 +00:00
Aaron Schubert
423a5b0752 Enabled Xcode 7 code coverage on project 2016-01-22 12:22:32 +00:00
Aaron Schubert
475c9c1e2c Check to see if Clang code coverage is interfering with GCC 2016-01-22 09:38:32 +00:00
appleguy
5a6d48b7d3 Merge pull request #1087 from aaronschubert0/patch-1
Update ReadMe to include Cocoapods downloads badge
2016-01-22 00:46:37 -08:00
appleguy
e5b2b566e4 Merge pull request #1084 from lkzhao/master
Update comments for ASPanningOverriddenUITextView
2016-01-21 23:17:17 -08:00
appleguy
992cc9fffa Merge pull request #1094 from binl/bl_layout_facilitator_beta
Remove public interface for ASCV with facilitator
2016-01-21 23:15:43 -08:00
Bin Liu
b2db6cce4d remove public interface for ASCV with facilitator 2016-01-21 22:39:27 -08:00
appleguy
aa0c64e8ea Merge pull request #1064 from binl/bl_layout_facilitator_change
Initial implementation of ASCollectionNode's LayoutFacilitator to help apps optimize custom layouts.
2016-01-21 21:12:02 -08:00
Bin Liu
1965018c46 attempt to fix build 2016-01-21 15:20:47 -08:00