Revert updates to ASViewController

This commit is contained in:
Levi McCallum
2016-02-10 15:22:43 -08:00
parent 2e74a75492
commit cb7ce44bf2

View File

@@ -48,6 +48,12 @@
self.view = _node.view; self.view = _node.view;
} }
- (void)viewWillLayoutSubviews
{
[super viewWillLayoutSubviews];
[_node measureWithSizeRange:[self nodeConstrainedSize]];
}
- (void)viewDidLayoutSubviews - (void)viewDidLayoutSubviews
{ {
if (_ensureDisplayed && self.neverShowPlaceholders) { if (_ensureDisplayed && self.neverShowPlaceholders) {
@@ -60,20 +66,10 @@
- (void)viewWillAppear:(BOOL)animated - (void)viewWillAppear:(BOOL)animated
{ {
[super viewWillAppear:animated]; [super viewWillAppear:animated];
[_node measureWithSizeRange:[self nodeConstrainedSize]];
_ensureDisplayed = YES; _ensureDisplayed = YES;
[_node recursivelyFetchData]; [_node recursivelyFetchData];
} }
- (void)viewWillTransitionToSize:(CGSize)size withTransitionCoordinator:(id<UIViewControllerTransitionCoordinator>)coordinator
{
[super viewWillTransitionToSize:size withTransitionCoordinator:coordinator];
[coordinator animateAlongsideTransition:^(id<UIViewControllerTransitionCoordinatorContext> _Nonnull context) {
[self.node transitionLayoutWithSizeRange:ASSizeRangeMake(size, size) animated:[context isAnimated]];
} completion:nil];
}
// MARK: - Layout Helpers // MARK: - Layout Helpers
- (ASSizeRange)nodeConstrainedSize - (ASSizeRange)nodeConstrainedSize