From 11e9657d93003f93c0e496ede12f64789d94ca7d Mon Sep 17 00:00:00 2001 From: "stefano.antonelli" Date: Sat, 24 Aug 2013 09:19:02 +0200 Subject: [PATCH] New fix for issue #90 based on the arthurfok suggestion I added the addRightMenu call and changed the check for the menu existence. https://github.com/stefanoa/SASlideMenu/issues/90 --- SASlideMenu/SASlideMenu/SASlideMenuRootViewController.h | 2 +- SASlideMenu/SASlideMenu/SASlideMenuViewController.m | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/SASlideMenu/SASlideMenu/SASlideMenuRootViewController.h b/SASlideMenu/SASlideMenu/SASlideMenuRootViewController.h index 290694b..39153cc 100644 --- a/SASlideMenu/SASlideMenu/SASlideMenuRootViewController.h +++ b/SASlideMenu/SASlideMenu/SASlideMenuRootViewController.h @@ -30,7 +30,7 @@ -(void) doSlideToSide; -(void) doSlideToLeftSide; -(void) rightMenuAction; - +-(void) addRightMenu; -(void) panItem:(UIPanGestureRecognizer*)gesture; @end diff --git a/SASlideMenu/SASlideMenu/SASlideMenuViewController.m b/SASlideMenu/SASlideMenu/SASlideMenuViewController.m index 406614d..e81bc46 100644 --- a/SASlideMenu/SASlideMenu/SASlideMenuViewController.m +++ b/SASlideMenu/SASlideMenu/SASlideMenuViewController.m @@ -72,13 +72,13 @@ -(void) revealLeftMenu{ [self.rootController doSlideToSide]; } -(void) revealRightMenu{ - if ([self.slideMenuDataSource respondsToSelector:@selector(hasRightMenuForIndexPath:)]) { - if ([self.slideMenuDataSource hasRightMenuForIndexPath:self.selectedIndexPath]) { - [self.rootController doSlideToLeftSide]; - } + if (self.rootController.isRightMenuEnabled && self.rootController.rightMenu != nil) { + [self.rootController addRightMenu]; + [self.rootController doSlideToLeftSide]; } } + #pragma mark - #pragma mark UIGestureRecognizerDelegate - (BOOL)gestureRecognizerShouldBegin:(UIGestureRecognizer *)gestureRecognizer {