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

Fixed #5 

Quick swipe should not open menu if delegate is not implemented or returns NO
This commit is contained in:
Aryan Ghassemi 2013-10-27 16:26:23 -07:00
parent ac45bf5353
commit 62e737bd83
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
SlideMenu/Source/SlideNavigationController.m
View File

@ -350,7 +350,6 @@ static SlideNavigationController *singletonInstance;
self.draggingPoint = translation;
//
if (rect.origin.x > 0)
{
[self.righMenu.view removeFromSuperview];
@ -392,7 +391,10 @@ static SlideNavigationController *singletonInstance;
}
else
{
[self openMenu:(velocity.x > 0) ? MenuLeft : MenuRight withDuration:MENU_QUICK_SLIDE_ANIMATION_DURATION andCompletion:nil];
Menu menu = (velocity.x > 0) ? MenuLeft : MenuRight;
if ([self shouldDisplayMenu:menu forViewController:self.visibleViewController])
[self openMenu:(velocity.x > 0) ? MenuLeft : MenuRight withDuration:MENU_QUICK_SLIDE_ANIMATION_DURATION andCompletion:nil];
}
}
}