Merge branch 'master' into update-objc

Conflicts: AsyncDisplayKit/Details/UIView+ASConvenience.h
2026-01-05 04:32:52 +00:00 · 2015-11-18 14:17:09 -08:00
parent ab326fc683 59d52ced3f
commit ecaabc8435
32 changed files with 1005 additions and 42 deletions
--- a/AsyncDisplayKit/ASCollectionNode.m
+++ b/AsyncDisplayKit/ASCollectionNode.m
@@ -31,4 +31,16 @@
  return (ASCollectionView *)[super view];
 }

+- (void)clearContents
+{
+  [super clearContents];
+  [self.view clearContents];
+}
+
+- (void)clearFetchedData
+{
+  [super clearFetchedData];
+  [self.view clearFetchedData];
+}
+
@end