Commit Graph

3224 Commits

Author SHA1 Message Date
Michael Schneider
255e75a9be Merge pull request #1893 from eJamesLin/fix_example_Multiplex_image_path
[Examples] fix image paths in example_extra/Multiplex
2016-07-11 14:20:10 -07:00
Hannah Troisi
488db475f4 Update GITHUB_RULES.md 2016-07-11 11:22:11 -07:00
CJ Lin
f8e294bc23 fix image paths in example_extra/Multiplex 2016-07-12 01:36:41 +08:00
Scott Goodson
012c927cd8 [ASLayout] Small optimization to eliminate one method call in an extremely hot codepath.
This was observed with quantitative profiling results.  We have some opportunities to micro-optimize the layout objects.
2016-07-10 23:02:39 -07:00
Hannah Troisi
a8f01fb13b Merge pull request #1887 from facebook/fixASDKgram
Remove UIKit call from -init!
2016-07-10 21:19:14 -07:00
Hannah Trosi
2317e17c53 Remove UIKit call from -init!1 2016-07-10 21:17:32 -07:00
Hannah Troisi
1d93dbc0b3 Add files via upload 2016-07-10 20:12:36 -07:00
Hannah Troisi
cf010176b4 Update .gitignore 2016-07-10 19:06:40 -07:00
Hannah Trosi
bd6e85e59d Remove old (original website) files from repository 2016-07-10 19:03:34 -07:00
Hannah Troisi
b9c9e6be5b Update README.md 2016-07-10 18:59:07 -07:00
appleguy
a9e3eacfe5 [ASCellNode] Add gating for -convertRect: call upon invisibility notification for iOS 7 & 8 edge case. (#1881)
* [ASCellNode] Add gating for -convertRect: call upon invisibility notification for iOS 7 & 8 edge case.

This should resolve https://github.com/facebook/AsyncDisplayKit/issues/1659, which corresponds to this
Fabric log for Pinterest: https://fabric.io/pinterest6/ios/apps/com.pinterest.enterprise/issues/5776fbfeffcdc042501a5f20/sessions/c178e977614b4ebab853084847fb241
8

* [ASCellNode] Additional improvements to visibilityDidChange: gating.
2016-07-10 16:01:55 -07:00
Hannah Trosi
5856bd3b59 [Cocoapods] Update podspec with 1.9.81 2016-07-10 12:53:44 -07:00
Flo
2e65339f33 [ASVideoNode, ASVideoPlayerNode] Add video composition and audio mix capabilities (#1800)
* [ASVideoNode] Add delegate method called when the currentItem is set.

* [ASVideoNode] Add videoComposition and audioMix properties to the ASVideoNode.

* [ASVideoPlayerNode] Add new initialiser with videoComposition and audioMix, and forward new delegate method.

* [ASVideoPlayerNode] Forward missing ASVideoNodeDelegate methods.
2016-07-10 11:32:21 -07:00
Hannah Troisi
10447998af [ASMapNode] use ASDisplayNode base class lock (#1879)
* [ASVideoPlayerNode] Use ASDisplayNode base class lock for subclass property syncrhonization, fix retain cycles

* [ASMapNode] Use ASDisplayNode base class lock instead of subclass lock
2016-07-10 00:30:37 -07:00
Scott Goodson
bf9c142765 Revert "[ASTextNode] Fix text node truncation (#1863)"
This reverts commit 6238e5edbd.

We will re-apply this change, but there are some early signs of performance impacts that need to be investigated.
2016-07-09 23:54:43 -07:00
Scott Goodson
d83f319fe3 Revert "Use textStorageCreationBlock for resetting the text storage (#1874)"
This reverts commit d646d3c753.
2016-07-09 23:54:28 -07:00
Hannah Troisi
ff7a586eba [ASVideoPlayerNode] Use ASDisplayNode base class lock for subclass property syncrhonization, fix retain cycles (#1878) 2016-07-09 23:51:49 -07:00
Scott Goodson
1d07759c9e [ASDisplayNode+AsyncDisplay] Add locking for _flags (although write-once-on-init, this quiets the Thread Sanitizer). 2016-07-09 23:50:40 -07:00
Eric Horacek
3efd01a781 [ASCollectionDataController] Repopulate deleted supplementary nodes if necessary (#1773)
* Repopulate deleted supplementary nodes if necessary

Fixes 1771

* Fix warning
2016-07-09 22:46:29 -07:00
Hannah Troisi
f39c2ce7e3 [ASTextNode, ASImageNode, ASVideoNode] Use ASDisplayNode base class lock for subclass property synchronization (#1877)
* [ASTextNode, ASVideoNode] Use ASDisplayNode base class lock for subclass property synchronization

* fix headers to match master

* address @appleguy, @maicki comments

* import header

* Swap lock in ASNetworkImageNode as well

* remove invalid comment

* more cleanup of locks
2016-07-09 22:08:34 -07:00
Flo
131dd25de3 [ASNetworkImageNode] Check that data is not nil before loading the animated image. (#1849) 2016-07-09 21:19:57 -07:00
appleguy
dc12042589 [ASDisplayNode] Do not start measurement for a transition if we have never been provided a constrainedSize. (#1844) 2016-07-09 21:16:29 -07:00
appleguy
3b2af7eb6d [Build] Remove Unused Imports across all of AsyncDisplayKit. This uses a feature of AppCode. (#1875)
Details on the tool are here: https://www.jetbrains.com/help/idea/2016.1/optimizing-imports.html
2016-07-09 17:20:59 -07:00
Michael Schneider
e7e2672472 Move imageLock in braces for getting drawing parameters (#1876) 2016-07-09 17:02:05 -07:00
Michael Schneider
d646d3c753 Use textStorageCreationBlock for resetting the text storage (#1874) 2016-07-09 16:43:18 -07:00
Scott Goodson
48311aee96 [Build] Fix build issue caused by an #import change. 2016-07-09 16:09:35 -07:00
gazreese
01ba38d818 [ASVideoPlayerNode] Ensure activity indicator view is transparent (#1852) 2016-07-09 16:00:48 -07:00
Scott Goodson
d8d20fd87c Merge branch 'kielgillard-master' 2016-07-09 15:44:50 -07:00
Scott Goodson
f0ff9c108d Merge branch 'master' of git://github.com/kielgillard/AsyncDisplayKit into kielgillard-master 2016-07-09 15:44:31 -07:00
Michael Schneider
6238e5edbd [ASTextNode] Fix text node truncation (#1863)
* Before truncate a text storage in ASTextKitContext reset the text storage to original value

* Fix ASTextNode tests

We should pass in the constrained size in both cases and the sizes should be the same. We adjust the calculated size in ASTextNode to be a bit narrower in the second case if we truncate again with the calculated size as constrained size it will truncate more and the resulting size will shrink.
2016-07-09 15:40:31 -07:00
Adlai Holler
38fab7cd94 Merge pull request #1816 from hannahmbanana/selectionBug
[ASCellNode] Fix selection / highlight implementation
2016-07-08 15:48:22 -07:00
Adlai Holler
0f589d7e2b Merge pull request #1847 from gazreese/ASVideoNode-no-auto-seek
[ASVideoNode] Only seek to beginning when auto repeating
2016-07-08 15:45:17 -07:00
Adlai Holler
a2d4dc5888 Merge pull request #1839 from maicki/MSAsyncMeasure
[ASDisplayNode] Allow measure always be off the main thread
2016-07-08 15:41:05 -07:00
Adlai Holler
09069584cc Merge pull request #1871 from maicki/MSMoveDeallocASImgeNode
[ASImageNode] Move dealloc method from ASImageNode+AnimatedImage category to ASImageNode
2016-07-08 15:20:06 -07:00
Adlai Holler
7995b6e3da Merge pull request #1872 from rcancro/containerSizeBug_upstream
[ASEnvironmentTraitCollection] Fixed bug where containerSize wasn't being saved
2016-07-08 15:19:38 -07:00
ricky
fe61c3e3ab [ASEnvironmentTraitCollection] Fixed bug where containerSize wasn't being saved
Summary:
The old assignment of `self.node.environmentTraitCollection.containerSize = windowSize;` doesn't because the struct creates a copy and then assigns `windowSize` to that copy.

Also realized that we need to create a new `ASEnvironmentTraitCollection` in `willTransitionToTraitCollection:withTransitionCoordinator`:. If we only update in `viewWillTransitionToSize:` we will only update the `containerSize` value in `self.environmentTraitCollection` as we don't have the new trait collection yet.

Differential Revision: https://phabricator.pinadmin.com/D101807
2016-07-08 15:00:50 -07:00
Michael Schneider
b2810edb0f Move dealloc method from ASImageNode+AnimatedImage category to ASImageNode
Having a dealloc method in a category can be very problematic as the superclass dealloc method will not be called in case it exists.
2016-07-08 14:41:47 -07:00
Adlai Holler
ac9549ee89 Merge pull request #1870 from maicki/MSTuningParametersInTableView
[ASTableView] Move setting of tuning parameters to the range controller
2016-07-08 14:38:15 -07:00
Adlai Holler
d1c84a1a28 Merge pull request #1814 from maicki/MSFixiOS8ModalRotationAdjustment
[ASViewController] Fix Modal presented ASViewController don't rotate on iOS 8.3
2016-07-08 14:37:59 -07:00
Michael Schneider
33e093b1f6 Check if a superview is present before calculating the legacy constrained size 2016-07-08 13:20:18 -07:00
Michael Schneider
057c48482a Fix Modal presented ASViewController don't rotate on iOS 8.3 2016-07-08 13:10:41 -07:00
Adlai Holler
b1626b0f69 Merge pull request #1791 from colinmcardell/ASCollectionDataController_supplementaryNodeOfKind-fix
[ASCollectionDataController] Exposing -supplementaryNodeOfKind
2016-07-08 12:50:32 -07:00
Adlai Holler
b3d673645d Merge pull request #1867 from maicki/MSFixXcode8Errors
Fix Xcode 8 Errors
2016-07-08 12:42:50 -07:00
Adlai Holler
78ef8cd8ae Merge pull request #1869 from facebook/AHDisableTroublesomeAssertions
[ASDataController] Temporarily Disable Some Troublesome Assertions
2016-07-08 12:15:08 -07:00
Michael Schneider
02a41f4db5 Move setting the tuning parameters to the range controller in ASTableView 2016-07-08 11:36:43 -07:00
Adlai Holler
a0aad4609d [ASDataController] Temporarily disable some troublesome assertions 2016-07-08 11:36:43 -07:00
Adlai Holler
82233af5a7 Merge pull request #1860 from rcancro/upstream_remove_context
[ASTraitCollection] Remove traitCollectionContext from ASTraitCollection; add containerWindowSize
2016-07-08 11:18:04 -07:00
Michael Schneider
f25e0f0d01 Fix Xcode 8 errors 2016-07-08 10:51:07 -07:00
Adlai Holler
33620b9e8e Merge pull request #1834 from maicki/MSVisibilityTriggeringViewCreation
[ASVisibility] Don't change the range mode if the node was not loaded yet
2016-07-08 10:32:20 -07:00
Adlai Holler
9154fbbdda Merge pull request #1864 from nguyenhuy/range_controller
[ASRangeController] Minimize number of registrations to node display notifications
2016-07-08 10:15:16 -07:00