From cb7ce44bf2d135b21fa15d9d8c5a56ee429832e7 Mon Sep 17 00:00:00 2001 From: Levi McCallum Date: Wed, 10 Feb 2016 15:22:43 -0800 Subject: [PATCH] Revert updates to ASViewController --- AsyncDisplayKit/ASViewController.m | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/AsyncDisplayKit/ASViewController.m b/AsyncDisplayKit/ASViewController.m index 754652248c..6f052a5c60 100644 --- a/AsyncDisplayKit/ASViewController.m +++ b/AsyncDisplayKit/ASViewController.m @@ -48,6 +48,12 @@ self.view = _node.view; } +- (void)viewWillLayoutSubviews +{ + [super viewWillLayoutSubviews]; + [_node measureWithSizeRange:[self nodeConstrainedSize]]; +} + - (void)viewDidLayoutSubviews { if (_ensureDisplayed && self.neverShowPlaceholders) { @@ -60,20 +66,10 @@ - (void)viewWillAppear:(BOOL)animated { [super viewWillAppear:animated]; - [_node measureWithSizeRange:[self nodeConstrainedSize]]; - _ensureDisplayed = YES; [_node recursivelyFetchData]; } -- (void)viewWillTransitionToSize:(CGSize)size withTransitionCoordinator:(id)coordinator -{ - [super viewWillTransitionToSize:size withTransitionCoordinator:coordinator]; - [coordinator animateAlongsideTransition:^(id _Nonnull context) { - [self.node transitionLayoutWithSizeRange:ASSizeRangeMake(size, size) animated:[context isAnimated]]; - } completion:nil]; -} - // MARK: - Layout Helpers - (ASSizeRange)nodeConstrainedSize