mbrucedogs/mvm_core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

to catch all scenarios

Browse Source
This commit is contained in:
Pfeil, Scott Robert 2018-05-07 16:12:39 -04:00
parent 50fb716f99
commit d91e8a8365
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
MVMCore/MVMCore/PresentationHandling/MVMCoreNavigationOperation.m
View File

@ -206,12 +206,17 @@
- (void)markAsFinished { - (void)markAsFinished {
self.navigationObject.navigationController.delegate = nil; self.navigationObject.navigationController.delegate = nil;
if (self.navigationObject.stopLoadingOverlay) {
[[MVMCoreLoadingOverlayHandler sharedLoadingOverlay] stopLoading:YES];
self.navigationObject.stopLoadingOverlay = NO;
}
[super markAsFinished]; [super markAsFinished];
} }
- (void)navigationController:(UINavigationController *)navigationController willShowViewController:(UIViewController *)viewController animated:(BOOL)animated { - (void)navigationController:(UINavigationController *)navigationController willShowViewController:(UIViewController *)viewController animated:(BOOL)animated {
if (self.navigationObject.stopLoadingOverlay) { if (self.navigationObject.stopLoadingOverlay) {
[[MVMCoreLoadingOverlayHandler sharedLoadingOverlay] stopLoading:YES]; [[MVMCoreLoadingOverlayHandler sharedLoadingOverlay] stopLoading:YES];
self.navigationObject.stopLoadingOverlay = NO;
} }
if (self.delegate && [self.delegate respondsToSelector:@selector(navigationController:willDisplayViewController:)]) { if (self.delegate && [self.delegate respondsToSelector:@selector(navigationController:willDisplayViewController:)]) {
@ -225,7 +230,6 @@
[self.delegate navigationController:navigationController displayedViewController:viewController]; [self.delegate navigationController:navigationController displayedViewController:viewController];
} }
[self markAsFinished]; [self markAsFinished];
} }
- (nullable id <UIViewControllerAnimatedTransitioning>)navigationController:(UINavigationController *)navigationController animationControllerForOperation:(UINavigationControllerOperation)operation fromViewController:(UIViewController *)fromVC toViewController:(UIViewController *)toVC { - (nullable id <UIViewControllerAnimatedTransitioning>)navigationController:(UINavigationController *)navigationController animationControllerForOperation:(UINavigationControllerOperation)operation fromViewController:(UIViewController *)fromVC toViewController:(UIViewController *)toVC {