3123 Commits

Author SHA1 Message Date
Ryan Nystrom
43be3294bc Remove "working range" from flow layout
This is a step towards a preloading range. We first want to migrate towards arbitrary ranges instead of being coupled to the notion of a single "working range".
2015-02-26 15:40:21 -08:00
Nadine Salter
9477114c86 Merge pull request #340 from facebook/fix_locking
Fix function call on lock/unlock api
2015-02-25 21:13:47 -08:00
Li Tan
88f77e5d52 Fix function call on lock/unlock api 2015-02-25 21:01:59 -08:00
Nadine Salter
8097a6edf1 Merge pull request #323 from facebook/issue-282
Change placeholder boolean to time interval
2015-02-25 20:54:19 -08:00
Li Tan
9d5d586aa4 Merge pull request #339 from facebook/fix_unlock_assertion
Fix wrong assertion
2015-02-25 20:07:11 -08:00
Li Tan
e862e04b05 Fix wrong assertion 2015-02-25 19:37:22 -08:00
Nadine Salter
ea13585ab0 Merge pull request #329 from ocrickard/master
Fix text node positioning for non-left alignment
2015-02-24 12:02:03 -08:00
Oliver Clark Rickard
582c11d447 Fix text node positioning for non-left alignment 2015-02-24 14:31:08 -05:00
Nadine Salter
2397bd0db6 Merge pull request #325 from facebook/fix_data_fetching
Sort array before data fetching
2015-02-24 11:09:51 -08:00
Li Tan
0e15b061d0 Sort array before data fetching 2015-02-23 20:45:25 -08:00
Nadine Salter
b023cfbb2a Merge pull request #303 from facebook/enable_async_data_fetching
Move ASTableView & ASCollectionView data fetching to background thread
2015-02-23 15:25:36 -08:00
Nadine Salter
1c2f44808d Merge pull request #324 from facebook/issue-316
Make project imports consistent
2015-02-23 15:17:07 -08:00
Ryan Nystrom
ad474fce8e Make project imports consistent 2015-02-23 14:55:15 -08:00
Ryan Nystrom
5d76d6649f Change placeholder boolean to time interval 2015-02-23 14:01:17 -08:00
Nadine Salter
07f8f8082f Merge pull request #322 from phatmann/patch-1
Sample code adds gesture recognizer to view
2015-02-23 13:49:23 -08:00
phatmann
897c257633 Sample code adds gesture recognizer to view 2015-02-23 07:14:17 -06:00
Nadine Salter
203d500416 Merge pull request #317 from facebook/revert-controls
ASControlNode touch and gesture handling parity with UIControl
2015-02-18 17:59:06 -08:00
Ryan Nystrom
d8f5d135b0 Revert ASControlNode to previous touch/gesture handling 2015-02-18 17:51:18 -08:00
Nadine Salter
236888784d Merge pull request #311 from facebook/add_indexpath_assertion
Add assertion to avoid inserting elements that is out of range
2015-02-17 14:09:11 -08:00
Li Tan
ad88da8b56 fix typo 2015-02-13 09:41:22 -08:00
Li Tan
ae5ee2926d Add assertion to avoid inserting elements that is out of range 2015-02-12 14:10:18 -08:00
Li Tan
831aa47ae0 Address comments 2015-02-11 19:15:08 -08:00
Nadine Salter
cd3a859f8c Merge pull request #308 from facebook/issue-262
Allow touches and long press on ASTextNode
2015-02-11 18:12:55 -08:00
Ryan Nystrom
478b4c7bab Allow touches and long press on ASTextNode
fixes #262
2015-02-11 18:04:22 -08:00
Nadine Salter
b4a5e657c5 Merge pull request #307 from facebook/issue-305
Allow all gestures through ASControlNode
2015-02-11 17:58:39 -08:00
Li Tan
6a2c472910 Add asyncDataFetchingEnabled as parameter of initializer of ASTableView & ASCollectionView
Conflicts:
	AsyncDisplayKit/ASCollectionView.mm
	AsyncDisplayKit/Details/ASDataController.mm
2015-02-11 17:24:49 -08:00
Li Tan
2f88ce56a2 Move ASTableView & ASCollectionView data fetching to background thread
Conflicts:
	AsyncDisplayKit/ASCollectionView.mm
	AsyncDisplayKit/Details/ASDataController.mm

Conflicts:
	AsyncDisplayKit/ASCollectionView.mm
	AsyncDisplayKit/Details/ASDataController.mm
2015-02-11 17:22:43 -08:00
Ryan Nystrom
52cbbd3d3c Allow all gestures through ASControlNode
fixes #305
2015-02-11 17:00:44 -08:00
Nadine Salter
e08975cbfa Merge pull request #304 from facebook/issue-286
ASImageNode not opaque by default
2015-02-11 15:54:16 -08:00
Nadine Salter
0dcb122629 Merge pull request #295 from facebook/fix_batch_update
Fix group updates/animation
2015-02-11 15:52:59 -08:00
Li Tan
dcb30b359c rename _batchUpdateFlag to _performingBatchUpdates 2015-02-11 15:22:24 -08:00
Ryan Nystrom
2a75f2bcd4 ASImageNode not opaque by default
fixes #298
2015-02-11 12:58:35 -08:00
Nadine Salter
0d0983e8f2 Merge pull request #302 from facebook/revert-228-wip/ASMultiplexImageNode-skip-failed-identifiers
Revert "Let ASMultiplexImageNode skip failed image identifiers"
2015-02-09 17:03:04 -08:00
Nadine Salter
3b8f275a2a Revert "Let ASMultiplexImageNode skip failed image identifiers" 2015-02-09 16:35:38 -08:00
Li Tan
25bdd0d84d remove program 2015-02-06 11:44:40 -08:00
Nadine Salter
8848c0db92 Merge pull request #293 from andyscott/adjust-delegate-param-types
Use specific types for Collection/TableView async delegate params
2015-02-05 10:56:31 -08:00
andyscott
cc819a7d49 Use more specific types for Collection/TableView async delegate params 2015-02-05 10:35:07 -08:00
Nadine Salter
e6d7985ac2 Merge pull request #286 from facebook/image-aspect-fit
Respect opacity of ASImageNode
2015-02-04 18:34:36 -08:00
Nadine Salter
f8037d435e Merge pull request #289 from facebook/fix_group_animation
Fix end update in group animation
2015-02-04 13:25:05 -08:00
Li Tan
08bb0b5d70 remove throw umimplemented exception 2015-02-04 11:55:38 -08:00
Li Tan
b5245f7cd4 Fix group update 2015-02-04 11:49:39 -08:00
Ryan Nystrom
1752c724fe Respect opacity of ASImageNode
fixes #284
2015-02-03 19:54:11 -08:00
Nadine Salter
3b8de5cf52 Merge pull request #283 from andyscott/feature-template-image-mod-block
Add image modification block to render template images w/ tint.
2015-02-03 14:13:57 -08:00
andyscott
4bd9ef2927 Add image modification block to render template images w/ tint. 2015-02-03 12:54:41 -08:00
Nadine Salter
6246f077fc Update comment in Kittens example project. 2015-02-03 08:27:21 -08:00
Nadine Salter
bfc828d6e0 Use default placeholder colour in Multiplex demo. 2015-02-03 08:25:07 -08:00
Nadine Salter
6819816bd3 Restore artificial delay in Multiplex demo.
The change to ASBasicImageDownloader regressed the artificial network
delay in the original demo code.  Revert it.
2015-02-03 08:18:57 -08:00
Nadine Salter
685263a58a Merge pull request #280 from facebook/miscellanea
Miscellanea
2015-02-02 20:13:28 -08:00
Nadine Salter
f085f06ff3 -[UIView addSubnode:], -[CALayer addSubnode:].
Bring back this convenience API -- it disappeared somewhere along the
line while we were building Paper.  This is totally trivial, but
conveniently won't break if you layer-back a leaf node.

Closes #278.
2015-02-02 19:59:30 -08:00
Nadine Salter
c6a04ef8bd Switch ASScrollNode to block initialiser syntax. 2015-02-02 19:41:30 -08:00