Commit Graph

13022 Commits

Author SHA1 Message Date
Michael Schneider
050fb626fa Merge pull request #1965 from maicki/MSFixCrashInsertNilNode
[ASDisplayNode] Don't crash if inserting a nil node
2016-07-21 16:38:16 -07:00
Adlai Holler
3bfa60c445 Move ASDataController+Subclasses.h to fix Swift build 2016-07-21 15:52:24 -07:00
Michael Schneider
bbe2fe5f4c Add and fix tests for adding a nil subnode 2016-07-21 14:54:39 -07:00
Michael Schneider
9b47a9114a Fix compiler warning in as_smallDescription on 32 bit (#1964) 2016-07-21 14:52:21 -07:00
Michael Schneider
4b9ee3c64d Don't crash if inserting a nil node 2016-07-21 14:41:19 -07:00
Adlai Holler
8cde594de3 [ASDataController] Add validation logic to the change set to throw exceptions on invalid updates (#1894)
[_ASHierarchyChangeSet] Oopsy daisy

[ASDataController] Tweak our update validation

[ASHierarchyChangeSet] Fix bugs

Finish up some stuff

[ASDataController] Put some stuff back

[ASChangeSetDataController] Always use changeset

[ASDataController] Put other stuff back

[_ASHierarchyChangeSet] Use fast enumeration

[_ASHierarchyChangeSet] Fix assertion format strings, return on fail so we don't crash in production

[ASDataController] Store data source item counts as vector rather than NSArray

[ASDataController] Build some tests for the update validation

[ASDataController] Fix issues with update validation

Get rid of new file

[ASDataController] Suppress changeset validation before initial reload

[ASDataController] Make invalid update log vs. exception publicly toggleable
2016-07-21 14:37:51 -07:00
Levi McCallum
0c70bca2bd [ASVideoNode] Fix conditional that prevented local asset loading (#1962)
* Fix conditional that prevented local asset loading

* Allow setting new asset to clear previously set URL
2016-07-21 10:39:31 -07:00
Max Gu
1d4620edce Adding documentation for assetURL in ASVideoNode, and adding a mutex lock for assetURL setter (#1961)
* Adding comment in ASVideoNode.h for the assetURL property

* Adding a mutexlock in setAssetURL in ASVideoNode
2016-07-20 18:40:49 -07:00
Adlai Holler
5723f603c1 Merge pull request #1954 from Xinchi/HLS_issue
Hls issue
2016-07-20 17:56:56 -07:00
Max Gu
6bd287086c Addressing Adlai's comment 2016-07-20 17:33:34 -07:00
Max Gu
b8ad8d6cc0 Combine 2 if statements into 1 2016-07-20 17:09:23 -07:00
Max Gu
76303f3799 Setting the internal asset to the player item's asest 2016-07-20 17:03:57 -07:00
Max Gu
b04aa2e2bc Removing some unused method 2016-07-20 16:07:17 -07:00
Max Gu
f6eaa43315 Adding the new ASVideoNode API that allows for video player item construction with URL 2016-07-20 16:01:14 -07:00
Brandon Withrow
3c9f1e27c8 Added support for scale, rotation, parenting, square layers 2016-07-20 15:41:40 -07:00
Benjamin Scholtysik (Reimold)
315e4d6651 Bump version number, add changelog and update readme 2016-07-20 15:33:00 -07:00
Benjamin Scholtysik (Reimold)
fde3f84d42 Fix build errors related to BITHockeyLog 2016-07-20 14:36:39 -07:00
Benjamin Scholtysik (Reimold)
127d41c7c0 Merge remote-tracking branch 'origin/master' into release/4.1.0-beta.3
# Conflicts:
#	.travis.yml
#	Classes/BITCrashManager.m
#	HockeySDK-Source.podspec
#	HockeySDK.podspec
#	README.md
#	Support/buildnumber.xcconfig
#	docs/Changelog-template.md
#	docs/Guide-Installation-Setup-template.md
2016-07-20 13:58:51 -07:00
Adlai Holler
abcdaf8f55 Merge pull request #1956 from facebook/AHNoSkipEmptyUpdate
[ASCollectionView] Do Not Suppress Empty Updates
2016-07-20 13:41:49 -07:00
Adlai Holler
3ebddb6837 [ASCollectionView] Move the variable in 2016-07-20 13:06:00 -07:00
Adlai Holler
6a13c0365b [ASCollectionView] Do not suppress empty updates 2016-07-20 12:53:01 -07:00
Lukas Spieß
798ec7b2e5 Use iOS 10 simualtor 2016-07-20 11:22:25 +02:00
Lukas Spieß
bf237965b4 Use Xcode 8 TravisCI image 2016-07-20 10:36:28 +02:00
Max Gu
44a80672cb Adding track to the requestedKeys to be loaded asynchronously so that it doesn't block the main thread 2016-07-19 20:25:32 -07:00
Michael Schneider
7096f47f90 Merge pull request #1951 from maicki/MSFixASViewControllerConstrainedSizeiOS8
Fixes iOS 7 and iOS 8 wrong size in viewWillAppear: while a a rotation is happening
2016-07-19 16:48:51 -07:00
Michael Schneider
90d5c97d0f Fixes iOS 7 and iOS 8 wrong size in viewWillAppear: while a a rotation is happening 2016-07-19 16:24:47 -07:00
Max Gu
7237149b0f Merge branch 'patch-4' of https://github.com/Xinchi/AsyncDisplayKit into patch-4 2016-07-19 15:58:56 -07:00
Max Gu
a4555869de Re-enabling HLS video constructed from URL
Apple claims in the AVFoundationProgramming Guide that HLS videos can be constructed only through URL, but later with iOS 4.3 release notes it claimed to bring updates to how the HLS videos should be initialized, which works with asset too. I’ve tested with both, and it looks like initializing with asset is buggy.
2016-07-19 15:57:22 -07:00
Brandon Withrow
c4879fe956 Wired up intial animations. Currently support transforms, shapes, and color animations. 2016-07-19 15:40:39 -07:00
Benjamin Scholtysik (Reimold)
cfee15828e Add API to track events with properties and measurements 2016-07-19 15:34:55 -07:00
Benjamin Reimold
b284d9afd0 Add paragraph about @import for integration as source. 2016-07-19 11:24:51 -07:00
Benjamin Reimold
a10fd552ec Bump version number, write changelog, fix travis ci test matrix 2016-07-19 10:31:21 -07:00
Adlai Holler
fceae5d2f8 Merge pull request #1946 from facebook/AHDataControllerGCD
[ASDataController] Migrate Editing Queue to GCD for Performance/Debuggability
2016-07-18 18:42:10 -07:00
Adlai Holler
1777dae300 [ASDataController] Set context variable value 2016-07-18 18:41:51 -07:00
Adlai Holler
46a911ecf4 [ASDataController] Clean up by using a dispatch_group 2016-07-18 15:01:22 -07:00
Adlai Holler
f737d28368 Merge pull request #1947 from facebook/AHFixZeroSizeLayout
[ASCollectionView/ASTableView] Check for Zero-Size Correctly
2016-07-18 13:53:36 -07:00
Adlai Holler
50e8ad2e7c [ASTableView/ASCollectionView] Ignore bounds.origin when checking for zero-size 2016-07-18 12:17:42 -07:00
Adlai Holler
fa34888d98 [ASDataController] Migrate to GCD queue to make debugging easier 2016-07-18 12:15:27 -07:00
appleguy
d4c5a09817 [ASDisplayNode+AsyncDisplay.mm] Refactor display block creation method for conciseness and readability. (#1933)
* [ASDisplayNode+AsyncDisplay.mm] Refactor display block creation method for conciseness and readability.

* [ASDisplayNode+AsyncDisplay.mm] Some additional fixes / improvements that are required for the prior commit.

* Fix one last spot of the merge with   __instanceLock__.unlock();
2016-07-16 16:24:07 -07:00
Michael Schneider
6e573fba0d Reset _calculatedSize if a new constrained size is set on the ASTextKitRenderer (#1942) 2016-07-16 16:23:47 -07:00
Scott Goodson
8644c03ab8 Revert "[ASDisplayNode] Short circuit measure calls that have a zero-area constrainedSize. (#1939)"
This reverts commit 3664ca67cb.
2016-07-16 16:12:50 -07:00
appleguy
74bf376b2f [ASDisplayNode] Rename _propertyLock to __instanceLock__ to avoid subclass naming collisions. (#1941) 2016-07-16 15:32:13 -07:00
appleguy
3664ca67cb [ASDisplayNode] Short circuit measure calls that have a zero-area constrainedSize. (#1939)
* [ASDisplayNode] Short circuit measure calls that have a zero-area constrainedSize.

  // If the constrainedSize is completely zero-area, then there is no possibility for layout calculations to be successful.
  // This also avoids the issue of an inset being applied to 0, creating negative frame values.

* [ASDisplayNode] Fix to shouldMeasure change.

* One more fix.
2016-07-16 15:31:51 -07:00
Hannah Troisi
4baf9bdbfe [Infer] Fix Infer errors/warnings (#1938)
* [Infer] Fix 11 Infer errors/warnings

* fix build error
2016-07-16 15:29:24 -07:00
Hannah Troisi
abf8d5b9aa [Infer] change atomic properties to nonatomic (#1932) 2016-07-16 10:46:55 -07:00
Adlai Holler
dda7accd8e [ASCollectionView] When resizing, invalidate after remeasuring all nodes (#1931) 2016-07-15 16:32:23 -07:00
Michael Schneider
3b09cbb845 Merge pull request #1929 from rcancro/textScaleFactors
[ASTextNode] use accessor for `pointSizeScaleFactors`
2016-07-15 16:01:02 -07:00
Brandon Withrow
1be9294a4c Refactored transforms. Added Grouping 2016-07-15 15:55:40 -07:00
ricky
bd907dcffd added comment 2016-07-15 15:39:30 -07:00
Michael Schneider
3237ccce60 Merge pull request #1930 from maicki/MSSmallCodeImprovement
[Followup] Small code improvements
2016-07-15 14:24:06 -07:00