1400 Commits

Author SHA1 Message Date
Adlai Holler
ee0c027ba6 Build photos image request class and tests 2015-09-25 15:25:37 -07:00
appleguy
c824644482 Merge pull request #685 from facebook/ASTableViewStressTestFix
Fix simple issue with ASTableViewStressTest, make Table / Collection handle changes to dataSource / delegate.
2015-09-24 20:14:51 -07:00
Scott Goodson
ee4b771d5d Fix simple issue with ASTableViewStressTest, make Table / Collection handle changes to dataSource / delegate. 2015-09-24 19:59:12 -07:00
Scott Goodson
47be24037d Reduce _ASAsyncTransaction allocations by ensuring nodes without display methods don't create them. 2015-09-24 19:26:00 -07:00
rcancro
52091eb589 Placeholder bug in ASEditableTextNode
When setting a default placeholder and an attributedString before `_textKitComponents.textView` was created, the placeholder and the string were both appearing in the text node.

`_updateDisplayingPlaceholder` is called in `setAttributedString`, but since  `_textKitComponents.textView` is nil the placeholder was not hidden. Calling `_updateDisplayingPlaceholder` after `_textKitComponents.textView` loads fixes this.
2015-09-23 16:11:46 -07:00
appleguy
7dbb07161f Merge pull request #674 from adly-holler/editable-text-assert-viewbacked
Assert that ASEditableTextNode stays view-backed
2015-09-22 13:51:16 -07:00
Adlai Holler
20c74229a9 Updates from PR 2015-09-22 13:16:59 -07:00
Steven Ramkumar
d09888f9c2 Add a indexPathForNode: to ASTableView 2015-09-22 12:09:56 -07:00
Adlai Holler
e9f463da73 Use the right name 2015-09-21 00:16:02 -07:00
Adlai Holler
a1ffa499cb Assert against the user trying to set isLayerBacked on ASEditableTextNode 2015-09-21 00:15:03 -07:00
Adlai Holler
441a0e6928 Update types for drawParameters 2015-09-20 22:32:04 -07:00
Adlai Holler
9d6b3b6e14 Merge branch 'master' into update-objc
Conflicts:
	AsyncDisplayKit/Details/ASTextNodeTextKitHelpers.h
2015-09-20 21:55:54 -07:00
Adlai Holler
efe198e814 Use ceilSize in ASEditableTextNode 2015-09-20 21:18:06 -07:00
Adlai Holler
4ef2e572e6 Elevate ceilPixel functions to ASTextNodeTextKitHelpers.h, add ceilSize 2015-09-20 21:17:24 -07:00
appleguy
ca9b1caca4 Merge pull request #672 from adly-holler/fix-collectionview-update-crash
Fix collection view data inconsistency
2015-09-20 11:21:15 +02:00
appleguy
aee6709229 Merge pull request #668 from adly-holler/imagenode-opaque-bg
Fill image context with background color if image node is opaque
2015-09-20 11:06:53 +02:00
Adlai Holler
86c1fa3981 Rename flag, default it to true, shorten some comment lines 2015-09-19 14:21:33 -07:00
Adlai Holler
7cd79e6e6f Tweak comment 2015-09-19 13:43:18 -07:00
Adlai Holler
f0f26d3dab Tweak the new pendingReload flag 2015-09-19 13:40:41 -07:00
Adlai Holler
77490e11c0 ASCollectionView: Suspend updates while reload data is pending 2015-09-19 13:35:57 -07:00
Adlai Holler
37e2a530ad Merge branch 'master' into update-objc 2015-09-19 12:53:06 -07:00
Adlai Holler
d0f4bacc67 ImageNode: fill background more efficiently 2015-09-19 12:23:51 -07:00
Scott Goodson
a8924a2977 Fix building test / profile under Xcode 7
It is strictly enforcing this unused variable (when asserts are compiled out).
2015-09-19 20:55:40 +02:00
Adlai Holler
f37a88d2e4 Give a prefix to make ASImageIdentifier typealias 2015-09-18 23:32:52 -07:00
Adlai Holler
c872485459 Fill image context with background color if image node is opaque 2015-09-17 21:59:52 -07:00
Adlai Holler
f20a0d4bc0 Add some nullables in ASTextNode 2015-09-17 19:56:21 -07:00
Adlai Holler
fd3a90a3ed Make image download token optional 2015-09-17 14:56:39 -07:00
Adlai Holler
ba9a742999 Fix nullability of ASImageDownloaderProtocol to conform to ASBasicImageDownloader behavior 2015-09-17 14:48:51 -07:00
Adlai Holler
38706d0962 Fix nullability in ASImageDownloaderProtocol completion handler 2015-09-17 14:22:29 -07:00
Adlai Holler
c010ddad3b Update all the files in the Details group 2015-09-17 13:30:28 -07:00
Adlai Holler
03648d12a8 Clarify ASCellNode docs that it is for use with collection view as well 2015-09-17 12:30:31 -07:00
Adlai Holler
309ecca444 In ASLayoutOptions, make initWithLayoutable: take a nullable argument 2015-09-17 11:42:38 -07:00
Adlai Holler
717df1cfd2 Merge latest master and update Layout headers 2015-09-17 11:39:59 -07:00
Adlai Holler
cde790124d Merge branch 'master' into update-objc 2015-09-17 11:27:27 -07:00
Huy Nguyen
a864341710 Remove nonnull and nuulable annotations in ASViewController. Travis don't recognize them (yet). 2015-09-17 16:07:43 +03:00
Huy Nguyen
fcd76dbd19 Use nonnull annotation, instead of sanity check, for node property in ASViewController. 2015-09-17 15:59:37 +03:00
Huy Nguyen
72d108cd98 Minor fixes in ASViewController and Multiplex sample. 2015-09-17 15:58:21 +03:00
Huy Nguyen
07c0d78c71 Add ASViewController and update Multiplex sample to use it. 2015-09-17 15:58:21 +03:00
appleguy
21bdbbe12f Merge pull request #665 from jflinter/jack-build-phase-cleanup
Clean up Cocoa Touch framework target
2015-09-17 10:15:21 +02:00
Jack Flintermann
ce33149548 make additional private headers actually private; import all public headers in AsyncDisplayKit.h 2015-09-16 23:31:48 -04:00
Jack Flintermann
ff1be72e04 add module.modulemap 2015-09-16 20:15:48 -04:00
Adlai Holler
e4dc823c0d hitTest:withEvent: return value should be nullable 2015-09-16 16:21:07 -07:00
Adlai Holler
a7240bac27 More objective-C cleanup 2015-09-16 15:41:56 -07:00
Adlai Holler
30ed0bd64a Restore old ASCollectionNode init 2015-09-16 15:39:06 -07:00
Adlai Holler
262d65eea9 More updates 2015-09-16 15:34:24 -07:00
Adlai Holler
814f72535c Add nullability annotations for public API 2015-09-16 15:21:35 -07:00
rcancro
7e3a0b3223 Changed copyIntoOptions to copyFromOptions
I thought I already did this. I think copyFrom is a better name.
2015-09-16 14:33:54 -07:00
Paul Young
77d74e60f0 Update header imports. 2015-09-16 12:17:01 -07:00
Paul Young
77dfd222d3 Merge branch 'master' into compiler-warnings 2015-09-16 12:13:50 -07:00
Paul Young
8426ab1122 Use a shared header for the static library and dynamic framework. 2015-09-16 12:12:21 -07:00