update code based on Scott's comment

This commit is contained in:
panxi 2019-05-08 11:03:14 -04:00
parent 3ec1364aed
commit f4bf4c0b5a
2 changed files with 6 additions and 10 deletions

View File

@ -343,9 +343,7 @@
- (BOOL)isOverridingRightButton { - (BOOL)isOverridingRightButton {
NSDictionary *rightPanelLinkDict = [self.loadObject.pageJSON dict:@"rightPanelButtonLink"]; NSDictionary *rightPanelLinkDict = [self.loadObject.pageJSON dict:@"rightPanelButtonLink"];
if (rightPanelLinkDict) { if (rightPanelLinkDict) {
[[MVMCoreActionHandler sharedActionHandler] handleActionWithDictionary:rightPanelLinkDict [[MVMCoreActionHandler sharedActionHandler] handleActionWithDictionary:rightPanelLinkDict additionalData:nil delegateObject:[self delegateObject]];
additionalData:nil
delegateObject:[self delegateObject]];
return YES; return YES;
} else { } else {
return NO; return NO;
@ -355,9 +353,7 @@
- (BOOL)isOverridingLeftButton { - (BOOL)isOverridingLeftButton {
NSDictionary *leftPanelLinkDict = [self.loadObject.pageJSON dict:@"leftPanelButtonLink"]; NSDictionary *leftPanelLinkDict = [self.loadObject.pageJSON dict:@"leftPanelButtonLink"];
if (leftPanelLinkDict) { if (leftPanelLinkDict) {
[[MVMCoreActionHandler sharedActionHandler] handleActionWithDictionary:leftPanelLinkDict [[MVMCoreActionHandler sharedActionHandler] handleActionWithDictionary:leftPanelLinkDict additionalData:nil delegateObject:[self delegateObject]];
additionalData:nil
delegateObject:[self delegateObject]];
return YES; return YES;
} else { } else {
return NO; return NO;

View File

@ -140,16 +140,16 @@
} }
- (BOOL)isOverridingLeftButton { - (BOOL)isOverridingLeftButton {
if ([self.viewController isKindOfClass:MFViewController.class]) { if ([self.viewController respondsToSelector:@selector(isOverridingLeftButton)]) {
return [(MFViewController *)self.viewController isOverridingLeftButton]; return [self.viewController performSelector:@selector(isOverridingLeftButton)];
} else { } else {
return [super isOverridingLeftButton]; return [super isOverridingLeftButton];
} }
} }
- (BOOL)isOverridingRightButton { - (BOOL)isOverridingRightButton {
if ([self.viewController isKindOfClass:MFViewController.class]) { if ([self.viewController respondsToSelector:@selector(isOverridingRightButton)]) {
return [(MFViewController *)self.viewController isOverridingRightButton]; return [self.viewController performSelector:@selector(isOverridingRightButton)];
} else { } else {
return [super isOverridingRightButton]; return [super isOverridingRightButton];
} }