Peter
d1da40bb0b
Merge commit '19a9d29aa873edcf5624bed7fa9ee86662da0bfd'
...
# Conflicts:
# Source/Details/ASCollectionGalleryLayoutDelegate.m
2017-09-11 00:03:22 +03:00
Adlai Holler
f58b0b3cd3
Rename the field again to nodeModel ( #504 )
...
* Rename the field to nodeModel
* A few more instances
* Fix method name
2017-08-10 16:11:12 -07:00
Adlai Holler
d2adb8f126
Rename -[ASCellNode viewModel] to -[ASCellNode nodeViewModel] to avoid collisions ( #499 )
...
* Rename -[ASCellNode viewModel] -> -[ASCellNode nodeViewModel] to avoid breaking existing code
* Update test
* Update the changelog
2017-08-07 11:04:31 -07:00
Peter
587d2b2132
Merge commit '3ccc2f0f15d2e4ed7105f0ef6aea575e05cfd7ad'
...
# Conflicts:
# AsyncDisplayKit.xcodeproj/project.pbxproj
# Source/ASDisplayNode.mm
# Source/ASMapNode.mm
# Source/Details/ASDataController.mm
# Source/Details/ASPINRemoteImageDownloader.h
# Source/Details/ASPINRemoteImageDownloader.m
2017-08-04 13:12:06 +03:00
Adlai Holler
83111de0cc
Add first-pass view model support to collection node. #trivial ( #356 )
...
* Add first-pass view model support for collection node. Much more to come!
* Address issues
* Update the gorram license header
* Dear lord
2017-06-12 16:50:33 -07:00
Adlai Holler
a7656766f9
Make Cell Node Properties Atomic ( #74 )
...
* Make ASCellNode indexPath and supplementaryElementKind atomic
* Update the change log
* Fix licenses
* Be explicit with atomic
* Rename the protocol
* And the file
2017-05-02 14:09:12 -07:00
Garrett Moon
8013e25524
Update license v2 ( #67 )
...
* Fixed license
* Update all licenses
* Update Dangerfile for new license
* Update already updated licenses
* Closer…
* Closer…
* Closer…
* Closer…
* Closer…
* Closer…
* Closer…
* Closer…
* Closer…
* Closer…
* Closer…
2017-04-24 16:59:57 -07:00
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
Huy Nguyen
54816ee1f2
[ASCollectionElement] Fix trait collection handling ( #3200 )
...
* Fix trait collection handling in ASCollectionElement
- Don't store a trait environment directly and request it when needed. The environment is often the cotaining collection/table node. Asking it for a trait collection is an upward tree traversal and can cause deadlocks. This reverts #2963 .
- If the environment changes during a change set update, notify all visible elements about the change. This fixes #2959 .
* Address comments
2017-03-21 18:03:23 +00: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
