Commit Graph

25012 Commits

Author SHA1 Message Date
Eric Jensen
14a389c5e0 Replace ASTextKitAttributes' objectsEqual with the shared ASObjectIsEqual 2016-03-17 10:36:35 -07:00
Lukas Spieß
3f6ca05cf5 Update handling of JSON Stream queue 2016-03-17 18:03:01 +01:00
Engin Kurutepe
ad09d83f19 make the sample scheme shared 2016-03-17 15:22:00 +01:00
Lukas Spieß
20edd64fb3 Restore functionality of isQueueBusy method 2016-03-17 15:18:41 +01:00
Lukas Spieß
ef8994f64d Move internal Channel methods to private header 2016-03-17 15:18:08 +01:00
Engin Kurutepe
e11ed66d99 use current-branch in carthage build 2016-03-17 15:00:32 +01:00
Engin Kurutepe
229bce7f42 disable autocreate schemes 2016-03-17 14:49:14 +01:00
Lukas Spieß
186df88f53 Always build test target to catch build errors earlier 2016-03-17 14:35:42 +01:00
Lukas Spieß
655edfd366 Fix check if loaded metadata is of the right class 2016-03-17 14:33:42 +01:00
Lukas Spieß
5a5eaf018b Reuse NSURLSession instead of creating a new one with each request 2016-03-17 14:33:33 +01:00
Engin Kurutepe
618febd29b Merge pull request #2 from ekurutepe/master
pull changes from master
2016-03-17 14:15:55 +01:00
Engin Kurutepe
780b00c0f9 Merge pull request #1 from facebook/master
pull changes from upstream
2016-03-17 14:13:41 +01:00
Hannah Troisi
69c3b6172c Merge remote-tracking branch 'facebook/master' 2016-03-17 03:09:21 -07:00
appleguy
d9ef0922d8 Merge pull request #1354 from ejensen/cleanup
[Refactoring] Objective-C 2.0 / Modern syntax for arrays, dictionaries, numbers; logic simplification
2016-03-17 01:06:33 -07:00
Hannah Troisi
19f0d5982b Merge remote-tracking branch 'facebook/master' 2016-03-16 23:16:39 -07:00
appleguy
2ad9d83520 Merge pull request #1353 from ejensen/spelling
[Documentation] Correct spelling errors
2016-03-16 22:53:15 -07:00
Hannah Troisi
2d1a8ff4d2 Merge remote-tracking branch 'facebook/master' 2016-03-16 22:48:25 -07:00
appleguy
37a0ba200c Merge pull request #1391 from facebook/ImageNodeDeadlock
[ASImageNode] -setDefaultImage: should release lock before calling -setImage:
2016-03-16 22:16:06 -07:00
appleguy
5788e40719 Merge pull request #1389 from maicki/ImproveASViewControllerExample
[Examples] Improve ASViewController example
2016-03-16 21:32:57 -07:00
Scott Goodson
a966b7b6a6 [ASImageNode] -setDefaultImage: should release lock before calling -setImage:
This allows -setImage: to fully unlock before it calls -invalidateCalculatedSize.
2016-03-16 20:55:08 -07:00
Christoph Wendt
95c2076c24 Fix bug: Forward custom endpoint to MetricsManager 2016-03-16 18:19:39 -07:00
Hannah Troisi
e4348c0516 Merge remote-tracking branch 'facebook/master' 2016-03-16 18:16:59 -07:00
Christoph Wendt
9588de1ffb Fix tests 2016-03-16 18:02:05 -07:00
appleguy
5f58b9d8af Merge pull request #1382 from maicki/AutomaticRangeModeImprovements
[ASRangeController] Improvements for automatic range mode to ensure it is persistent / stable if set for an invisible view.
2016-03-16 16:50:28 -07:00
Michael Schneider
e297608e2a In the first range update and the range mode is not explicitly use the automatic range mode detection
This is necessary to get out of the initial range mode state into the first defined range mode state
2016-03-16 16:44:58 -07:00
Michael Schneider
e82118e72f Add assertion for ASDisplayNode is layer backed if using ASInterfaceStateForDisplayNode 2016-03-16 16:27:08 -07:00
Michael Schneider
41ca796ef4 Improve logic around choosing the range mode automatically and update documentation around logic 2016-03-16 13:37:33 -07:00
Michael Schneider
8d771f930a Refactor calculation of interface state based on ASDisplayNode and window 2016-03-16 13:26:17 -07:00
Michael Schneider
3b4e8d732c Improve way to detect interface state of ASCollectionView and ASTableView 2016-03-16 11:45:22 -07:00
Michael Schneider
19232ac493 Address pull request comments 2016-03-16 11:44:56 -07:00
Michael Schneider
d3ba80ccfd Improvements for automatic range mode
- Only update range mode if visibility changes if the node is not range controlled
- Only change explicitly set range mode if ASRangeController becomes visible
- Return interface state for range controller in ASCollectionView and ASTableView based on if the containing node is range managed
2016-03-16 11:44:56 -07:00
appleguy
b30fa8b2f6 Merge pull request #1373 from maicki/FullRangeModeOnScroll
[ASRangeController] Go into full range mode if a scroll happens
2016-03-16 11:33:43 -07:00
appleguy
85cba28744 Merge pull request #1378 from hannahmbanana/arrayUtils
[ASMultidimensionalArrayUtils] Optimization for recursive version, expanded use case of more efficient 2D version
2016-03-16 11:25:49 -07:00
appleguy
9b26d94da7 Merge pull request #1386 from maicki/ReplaceRecursiveCallsWithHelperFunction
[ASDisplayNode] Replace recursive methods with ASDisplayNodePerformBlockOnEveryNode
2016-03-16 11:20:17 -07:00
Michael Schneider
788cdbd326 Improve ASViewController example 2016-03-16 09:36:35 -07:00
Peter
2a0ce4ac86 Merge commit '192e9398e53685be52e0eab26501a1f2a2926cdd' 2016-03-16 14:57:35 +03:00
Peter
771c71117b no message 2016-03-16 14:56:50 +03:00
Eric Jensen
33fda7ab49 - Use modern Objective-C syntax.
-  Simplify comparisons.
-  Remove dead stores.
2016-03-15 22:34:29 -07:00
Eric Jensen
ddd5ff1f75 Correct spelling errors 2016-03-15 21:56:51 -07:00
appleguy
192e9398e5 Merge pull request #1381 from ejensen/image_modification_block_nullability
[ASImageNode] Annotate imageModificationBlock as nullable
2016-03-15 17:49:34 -07:00
appleguy
1e993c1516 Merge pull request #1377 from erichoracek/fix-umbrella
[AsyncDisplayKit] Ensure overall .h (umbrella header) includes new ASRunLoopQueue.h
2016-03-15 17:31:44 -07:00
Scott Goodson
abd148ae2e [Testing] ASVideoNodeTests should not pass in an invalid combination of ASInterfaceState flags. 2016-03-15 17:25:47 -07:00
appleguy
8fb18714ac Merge pull request #1385 from maicki/DisplayNodePendingNodePropertyDeadlock
[ASDisplayNode] Remove unnecessary lock for subnode display notifications (main thread only), avoid potential deadlock by traversing up hierarchy.
2016-03-15 17:15:13 -07:00
appleguy
f13f2ab980 Merge pull request #1384 from nguyenhuy/add_shouldAnimateSizeChanges
[ASCollectionView] Don't animate size changes if some of the updated cell nodes don't want to
2016-03-15 17:12:48 -07:00
Michael Schneider
f385fa8ada Replace recursive methods with ASDisplayNodePerformBlockOnEveryNode function 2016-03-15 16:34:40 -07:00
Michael Schneider
b7a92b2947 Add documentation for visibilityDidChange: 2016-03-15 16:30:49 -07:00
Michael Schneider
863b0ca956 Remove the lock for accessing _pendingDisplayNodes and force methods regarding display to the main thread
This should fix a deadlock in ASDisplayNode and it's caused by displayWillStart: and where one thread is recursing down the tree and another thread is recursing up the tree. We remove the lock in _pendingDisplayNodes for the property, but need to guarantee that we only modify the _pendingDisplayNodes state on the main thread.

Furthermore add documentation on what thread displayWillStart and displayDidFinish will be called
2016-03-15 16:30:08 -07:00
Huy Nguyen
22b105bfdc ASCollectionView doesn't animate size changes if some of the updated cell nodes don't want to 2016-03-15 16:17:43 -07:00
Eric Jensen
6ebb376a4d Annotate ASImageNode's imageModificationBlock as nullable 2016-03-15 12:58:23 -07:00
Christoph Wendt
168dc76f8f Remove unused coment blocks 2016-03-15 11:43:13 -07:00