Peter
baf94a7575
Merge commit '30ad10da3c34439d6c1c8f8e8f88539d875cf6bf'
...
# Conflicts:
# AsyncDisplayKit.xcodeproj/project.pbxproj
# Source/ASImageNode+AnimatedImage.mm
# Source/ASImageNode.mm
# Source/AsyncDisplayKit.modulemap
# Source/Details/_ASCollectionViewCell.m
# Source/asdkmodule.modulemap
# Source/module.modulemap
2017-04-18 19:50:49 +03:00
Garrett Moon
30ad10da3c
_setImage wasn't calling correct implementation ( #3243 )
...
_setImage is intended to call the super version of the method,
however with the adoption of the new _locked_ prefix, ASImageNode's
implementation would call back into ASNetworkImageNode's implementation.
This restore the intent of the _setImage method.
2017-04-04 15:13:10 -07:00
Michael Schneider
1f042e960d
[ASNetworkImageNode] Improve locking ( #3187 )
...
* Locking improvements for ASNetworkImageNode
* Fix typo
* Address comments
* Address comments
* Change comment to kick build
2017-03-28 10:42:59 +01:00
Flo
d5a84bf7b1
[ASImageProtocols] Fix nullables to avoid bridging crashes ( #3190 )
...
* [ASMultiplex/NetworkImageNode] Ensure ASImageProtocols are not called with nil arguments.
* [ASBasic/PINRemoteImageDownloader] Do not check for nil downloadIdentifier needlessly.
* [ASImageCacheProtocol] Make synchronouslyFetchedCachedImageWithURL URL nonnull.
2017-03-17 11:46:10 -07:00
Peter
7617b9a9f3
Merge commit 'e6ee24debcae89bd0066061b42ad1a6a73da9486'
...
# Conflicts:
# Source/ASDisplayNode.mm
# Source/ASImageNode.mm
# Source/Details/ASCollectionViewLayoutController.mm
2017-03-15 13:31:39 +03:00
Adlai Holler
0de270fdfb
Revert "Improve designated initializer usage ( #3132 )"
...
This reverts commit eaa875c7f2e08afa8b597c653be6b7c45cfff66d.
2017-03-03 15:31:28 -08:00
Michael Schneider
eaa875c7f2
Improve designated initializer usage ( #3132 )
...
* Improve designated initializer usage
* Some more changes
* Add some whitespace
* Fix some warning
2017-03-03 14:49:34 -08:00
Garrett Moon
40d3a1de7a
Trying to set the progress block with a nil identifire doesn't make sense. ( #3117 )
2017-03-01 19:51:16 -08:00
Peter
d1ab6976b5
Merge commit 'a08d9dc7328bef8cfc1b50b36cc05edb09af25a3'
...
# Conflicts:
# AsyncDisplayKit.xcodeproj/project.pbxproj
# AsyncDisplayKit/ASPagerFlowLayout.m
# AsyncDisplayKit/AsyncDisplayKit.modulemap
# AsyncDisplayKit/Details/ASCollectionDataController.h
# AsyncDisplayKit/Details/ASCollectionDataController.mm
# AsyncDisplayKit/Details/ASDataController.mm
# AsyncDisplayKit/Private/ASDataController+Subclasses.h
# AsyncDisplayKit/module.modulemap
# Source/Debug/AsyncDisplayKit+Debug.h
# Source/Details/ASCollectionElement.mm
# Source/module.modulemap
2017-03-01 15:57:40 +04:00
Adlai Holler
73ca6ab514
Shuffle & Cleanup Stuff ( #3080 )
2017-02-26 18:14:13 -08:00
