TouchInstinct
/
iOS-Slide-Menu
303
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

View controller is opening when menu is starting to close

This commit is contained in:
Anton 2015-10-06 14:21:09 +03:00
parent f3b60362da
commit 06deaf308c
1 changed files with 40 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
SlideMenu/Source/SlideNavigationController.m
View File

@ -218,7 +218,7 @@ static SlideNavigationController *singletonInstance;
return;
}
void (^setNewControllerBlock)() = ^{
void (^switchAndCallCompletion)(BOOL) = ^(BOOL closeMenuBeforeCallingCompletion) {
if (poptype == PopTypeAll) {
[self setViewControllers:@[viewController]];
}
@ -226,24 +226,47 @@ static SlideNavigationController *singletonInstance;
[super popToRootViewControllerAnimated:NO];
[super pushViewController:viewController animated:NO];
}
};
if ([self isMenuOpen])
{
[self closeMenuWithCompletion:^{
setNewControllerBlock();
if (closeMenuBeforeCallingCompletion)
{
[self closeMenuWithCompletion:^{
if (completion)
completion();
}];
}
else
{
if (completion)
completion();
}];
}
else
{
setNewControllerBlock();
if (completion)
completion();
}
}
};
// if ([self isMenuOpen])
// {
// if (slideOutAnimation)
// {
// [UIView animateWithDuration:(slideOutAnimation) ? self.menuRevealAnimationDuration : 0
// delay:0
// options:self.menuRevealAnimationOption
// animations:^{
// CGFloat width = self.horizontalSize;
// CGFloat moveLocation = (self.horizontalLocation> 0) ? width : -1*width;
// [self moveHorizontallyToLocation:moveLocation];
// } completion:^(BOOL finished) {
// switchAndCallCompletion(YES);
// }];
// }
// else
// {
// switchAndCallCompletion(YES);
// }
// }
// else
// {
// switchAndCallCompletion(NO);
// }
switchAndCallCompletion([self isMenuOpen]);
}
- (void)switchToViewController:(UIViewController *)viewController withCompletion:(void (^)())completion