Merge branch 'develop' into feature/kevin
This commit is contained in:
commit
f00f24f35f
@ -342,9 +342,11 @@ static const CGFloat CheckBoxHeightWidth = 18.0;
|
|||||||
[self.checkMark updateCheckSelected:NO animated:animated];
|
[self.checkMark updateCheckSelected:NO animated:animated];
|
||||||
}
|
}
|
||||||
|
|
||||||
FormValidator *formValidator = ((MVMCoreUIDelegateObject *)self.delegate).formValidationProtocol.formValidatorModel;
|
if (self.delegate && [self.delegate respondsToSelector:@selector(formValidationProtocol)] && [[self.delegate performSelector:@selector(formValidationProtocol)] respondsToSelector:@selector(formValidatorModel)]) {
|
||||||
|
FormValidator *formValidator = [[self.delegate performSelector:@selector(formValidationProtocol)] performSelector:@selector(formValidatorModel)];
|
||||||
[formValidator enableByValidation];
|
[formValidator enableByValidation];
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
- (void)setColor:(nullable UIColor *)color forState:(UIControlState)state {
|
- (void)setColor:(nullable UIColor *)color forState:(UIControlState)state {
|
||||||
if (color) {
|
if (color) {
|
||||||
|
|||||||
@ -343,15 +343,24 @@
|
|||||||
- (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;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
- (BOOL)isOverridingLeftButton {
|
||||||
|
NSDictionary *leftPanelLinkDict = [self.loadObject.pageJSON dict:@"leftPanelButtonLink"];
|
||||||
|
if (leftPanelLinkDict) {
|
||||||
|
[[MVMCoreActionHandler sharedActionHandler] handleActionWithDictionary:leftPanelLinkDict additionalData:nil delegateObject:[self delegateObject]];
|
||||||
|
return YES;
|
||||||
|
} else {
|
||||||
|
return NO;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
- (void)setSupportShouldBeAccessible:(BOOL)supportShouldBeAccessible {
|
- (void)setSupportShouldBeAccessible:(BOOL)supportShouldBeAccessible {
|
||||||
|
|
||||||
MVMCoreUISplitViewController *splitViewController = [MVMCoreUISession sharedGlobal].splitViewController;
|
MVMCoreUISplitViewController *splitViewController = [MVMCoreUISession sharedGlobal].splitViewController;
|
||||||
|
|||||||
@ -139,6 +139,22 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
- (BOOL)isOverridingLeftButton {
|
||||||
|
if ([self.viewController respondsToSelector:@selector(isOverridingLeftButton)]) {
|
||||||
|
return [self.viewController performSelector:@selector(isOverridingLeftButton)];
|
||||||
|
} else {
|
||||||
|
return [super isOverridingLeftButton];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
- (BOOL)isOverridingRightButton {
|
||||||
|
if ([self.viewController respondsToSelector:@selector(isOverridingRightButton)]) {
|
||||||
|
return [self.viewController performSelector:@selector(isOverridingRightButton)];
|
||||||
|
} else {
|
||||||
|
return [super isOverridingRightButton];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
#pragma mark - View Cycle
|
#pragma mark - View Cycle
|
||||||
|
|
||||||
- (void)loadView {
|
- (void)loadView {
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user